Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: src/Notification.cpp

Issue 5797488346791936: Issue 1107 - Support notifications (Closed)
Left Patch Set: Created Jan. 19, 2015, 12:50 p.m.
Right Patch Set: fix comment Created Jan. 23, 2015, 3:56 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « src/FilterEngine.cpp ('k') | test/Notification.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #include <AdblockPlus/JsValue.h> 18 #include <AdblockPlus/JsValue.h>
19 #include <AdblockPlus/JsEngine.h> 19 #include <AdblockPlus/JsEngine.h>
20 #include <AdblockPlus/Notification.h> 20 #include <AdblockPlus/Notification.h>
21 #include <algorithm> 21 #include <algorithm>
22 22
23 using namespace AdblockPlus; 23 using namespace AdblockPlus;
24 24
25 namespace 25 namespace
26 { 26 {
27 typedef std::pair<NotificationType, std::string> NotificationTypeString; 27 typedef std::pair<NotificationType, std::string> NotificationTypeString;
28 typedef std::vector<NotificationTypeString> NotificationTypes; 28 typedef std::vector<NotificationTypeString> NotificationTypes;
29 const NotificationTypes g_notificationTypes = []()->NotificationTypes 29 NotificationTypes InitNotificationTypes()
30 { 30 {
31 NotificationTypes retValue; 31 NotificationTypes retValue;
32 retValue.emplace_back(std::make_pair(NotificationType::NOTIFICATION_TYPE_QUE STION, "question")); 32 retValue.push_back(std::make_pair(NotificationType::NOTIFICATION_TYPE_QUESTI ON, "question"));
33 retValue.emplace_back(std::make_pair(NotificationType::NOTIFICATION_TYPE_CRI TICAL, "critical")); 33 retValue.push_back(std::make_pair(NotificationType::NOTIFICATION_TYPE_CRITIC AL, "critical"));
34 retValue.emplace_back(std::make_pair(NotificationType::NOTIFICATION_TYPE_INF ORMATION, "information")); 34 retValue.push_back(std::make_pair(NotificationType::NOTIFICATION_TYPE_INFORM ATION, "information"));
35 return retValue; 35 return retValue;
36 }(); 36 }
37
38 const NotificationTypes notificationTypes = InitNotificationTypes();
37 39
38 NotificationType StringToNotificationType(const std::string& value) 40 NotificationType StringToNotificationType(const std::string& value)
39 { 41 {
40 auto ii_notificationType = std::find_if(g_notificationTypes.begin(), g_notif icationTypes.end(), 42 struct IsSecondEqualToPredicate
41 [&value](const NotificationTypeString& pair)->bool
42 { 43 {
43 return value == pair.second; 44 std::string value;
44 }); 45 bool operator()(const NotificationTypeString& pair) const
45 if (ii_notificationType == g_notificationTypes.end()) 46 {
47 return value == pair.second;
48 }
49 } findBySecond = {value};
50 NotificationTypes::const_iterator notificationTypeIterator = std::find_if(
51 notificationTypes.begin(), notificationTypes.end(), findBySecond);
52 if (notificationTypeIterator == notificationTypes.end())
46 { 53 {
47 return NotificationType::NOTIFICATION_TYPE_INFORMATION; 54 return NotificationType::NOTIFICATION_TYPE_INFORMATION;
48 } 55 }
49 return ii_notificationType->first; 56 return notificationTypeIterator->first;
50 }
51
52 std::string NotificationTypeToString(NotificationType value)
53 {
54 auto ii_notificationType = std::find_if(g_notificationTypes.begin(), g_notif icationTypes.end(),
55 [&value](const NotificationTypeString& pair)->bool
56 {
57 return value == pair.first;
58 });
59 if (ii_notificationType == g_notificationTypes.end())
60 {
61 return "information";
62 }
63 return ii_notificationType->second;
64 } 57 }
65 } 58 }
66 59
67 Notification::Notification(NotificationType type, const std::string& id, const J sValuePtr& jsValue, PrivateCtrArg) 60 Notification::Notification(const JsValuePtr& jsValue)
68 : JsValue(jsValue) 61 : JsValue(jsValue)
69 { 62 {
70 SetProperty("type", NotificationTypeToString(type));
71 SetProperty("id", id);
72 }
73
74 std::string Notification::GetId() const
75 {
76 auto jsValue = GetProperty("id");
77 return jsValue ? jsValue->AsString() : "";
78 } 63 }
79 64
80 NotificationType Notification::GetType() const 65 NotificationType Notification::GetType() const
81 { 66 {
82 auto jsValue = GetProperty("type"); 67 return type;
83 return StringToNotificationType(jsValue ? GetProperty("type")->AsString() : "" );
84 } 68 }
85 69
86 void Notification::SetTitle(const std::string& value, const std::string& locale) 70 const std::string& Notification::GetTitle() const
87 { 71 {
88 SetMultilingualProperty("title", value, locale); 72 return title;
89 } 73 }
90 74
91 void Notification::SetMessage(const std::string& value, const std::string& local e) 75 const std::string& Notification::GetMessageString() const
92 { 76 {
93 SetMultilingualProperty("message", value, locale); 77 return message;
94 } 78 }
95 79
96 void Notification::SetMultilingualProperty(const std::string& propertyName, 80 void Notification::MarkAsShown()
97 const std::string& value,
98 const std::string& locale)
99 { 81 {
100 if (locale.empty()) 82 JsValueList params;
101 { 83 params.push_back(GetProperty("id"));
102 SetProperty(propertyName, value); 84 jsEngine->Evaluate("API.markNotificationAsShown")->Call(params);
103 }
104 else
105 {
106 auto multilingualPropertyBag = GetProperty(propertyName);
107 if (!multilingualPropertyBag || !multilingualPropertyBag->IsObject())
108 {
109 multilingualPropertyBag = jsEngine->NewObject();
110 multilingualPropertyBag->SetProperty(locale, value);
111 SetProperty(propertyName, multilingualPropertyBag);
112 }
113 else
114 {
115 multilingualPropertyBag->SetProperty(locale, value);
116 }
117 }
118 } 85 }
119 86
120 std::vector<std::string> Notification::GetUrlFilters() const 87 NotificationPtr Notification::JsValueToNotification(const JsValuePtr& jsValue)
121 { 88 {
122 std::vector<std::string> retValue; 89 if (!jsValue || !jsValue->IsObject())
123 auto jsUrlFilters = GetProperty("urlFilters");
124 if (!jsUrlFilters || !jsUrlFilters->IsArray())
125 { 90 {
126 return retValue; 91 return NotificationPtr();
127 } 92 }
128 auto urlFiltersList = jsUrlFilters->AsList(); 93
129 for (auto ii_urlFilter = urlFiltersList.begin(); ii_urlFilter != urlFiltersLis t.end(); ++ii_urlFilter) 94 NotificationPtr notification(new Notification(jsValue));
95 JsValuePtr jsType = notification->GetProperty("type");
96 notification->type = StringToNotificationType(jsType ? jsType->AsString() : "" );
97
98 JsValueList params;
99 params.push_back(notification);
100 JsValuePtr func = notification->jsEngine->Evaluate("API.getNotificationTexts") ;
101 JsValuePtr jsTexts = func->Call(params);
102 JsValuePtr jsTitle = jsTexts->GetProperty("title");
103 if (jsTitle->IsString())
130 { 104 {
131 if (!*ii_urlFilter) 105 notification->title = jsTitle->AsString();
132 {
133 continue;
134 }
135 retValue.emplace_back((*ii_urlFilter)->AsString());
136 } 106 }
137 return retValue; 107 JsValuePtr jsMessage = jsTexts->GetProperty("message");
138 } 108 if (jsMessage->IsString())
139
140 void Notification::AddUrlFilter(const std::string& value)
141 {
142 if (value.empty())
143 { 109 {
144 return; 110 notification->message = jsMessage->AsString();
145 } 111 }
146 auto jsFilter = jsEngine->NewValue(value); 112 return notification;
147 auto jsUrlFilters = GetProperty("urlFilters");
148 if (jsUrlFilters && jsUrlFilters->IsArray())
149 {
150 jsUrlFilters->Push(jsFilter);
151 return;
152 }
153 jsUrlFilters = jsEngine->NewArray();
154 jsUrlFilters->Push(jsFilter);
155 SetProperty("urlFilters", jsUrlFilters);
156 }
157
158 Notification::Notification(const JsValuePtr& jsValue, PrivateCtrArg)
159 : JsValue(jsValue)
160 {
161 }
162
163 std::tr1::shared_ptr<Notification> Notification::JsValueToNotification(const JsV aluePtr& jsValue)
164 {
165 if(!jsValue || !jsValue->IsObject())
166 {
167 return std::tr1::shared_ptr<Notification>();
168 }
169 return std::tr1::make_shared<Notification>(jsValue, PrivateCtrArg());
170 }
171
172 NotificationTexts Notification::JsTextsToNotificationTexts(const JsValue& jsText )
173 {
174 NotificationTexts retValue;
175 auto jsTitle = jsText.GetProperty("title");
176 if (jsTitle && jsTitle->IsString())
177 {
178 retValue.title = jsTitle->AsString();
179 }
180 auto jsMessage = jsText.GetProperty("message");
181 if (jsMessage && jsMessage->IsString())
182 {
183 retValue.message = jsMessage->AsString();
184 }
185 return retValue;
186 } 113 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld