projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6f55061
)
Use better notification ID.
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 25 May 2011 17:39:52 +0000
(19:39 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 25 May 2011 17:39:52 +0000
(19:39 +0200)
src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/WebInterface.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationAjaxPage.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
b/src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
index
2362d6a
..
37cff6f
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
+++ b/
src/main/java/net/pterodactylus/sone/notify/ListNotificationFilters.java
@@
-59,7
+59,7
@@
public class ListNotificationFilters {
if (filteredNotification != null) {
filteredNotifications.add(filteredNotification);
}
if (filteredNotification != null) {
filteredNotifications.add(filteredNotification);
}
- } else if (notification.getId().equals("new-repl
ies
-notification")) {
+ } else if (notification.getId().equals("new-repl
y
-notification")) {
ListNotification<Reply> filteredNotification = filterNewReplyNotification((ListNotification<Reply>) notification, currentSone);
if (filteredNotification != null) {
filteredNotifications.add(filteredNotification);
ListNotification<Reply> filteredNotification = filterNewReplyNotification((ListNotification<Reply>) notification, currentSone);
if (filteredNotification != null) {
filteredNotifications.add(filteredNotification);
diff --git
a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index
75caba2
..
e155944
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/
src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@
-224,7
+224,7
@@
public class WebInterface implements CoreListener {
newPostNotification = new ListNotification<Post>("new-post-notification", "posts", newPostNotificationTemplate, false);
Template newReplyNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/newReplyNotification.html"));
newPostNotification = new ListNotification<Post>("new-post-notification", "posts", newPostNotificationTemplate, false);
Template newReplyNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/newReplyNotification.html"));
- newReplyNotification = new ListNotification<Reply>("new-repl
ies
-notification", "replies", newReplyNotificationTemplate, false);
+ newReplyNotification = new ListNotification<Reply>("new-repl
y
-notification", "replies", newReplyNotificationTemplate, false);
Template rescuingSonesTemplate = TemplateParser.parse(createReader("/templates/notify/rescuingSonesNotification.html"));
rescuingSonesNotification = new ListNotification<Sone>("sones-being-rescued-notification", "sones", rescuingSonesTemplate);
Template rescuingSonesTemplate = TemplateParser.parse(createReader("/templates/notify/rescuingSonesNotification.html"));
rescuingSonesNotification = new ListNotification<Sone>("sones-being-rescued-notification", "sones", rescuingSonesTemplate);
diff --git
a/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationAjaxPage.java
b/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationAjaxPage.java
index
0472349
..
1406c3a
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationAjaxPage.java
@@
-83,7
+83,7
@@
public class GetNotificationAjaxPage extends JsonPage {
Notification notification = webInterface.getNotifications().getNotification(notificationId);
if ("new-post-notification".equals(notificationId)) {
notification = ListNotificationFilters.filterNewPostNotification((ListNotification<Post>) notification, currentSone);
Notification notification = webInterface.getNotifications().getNotification(notificationId);
if ("new-post-notification".equals(notificationId)) {
notification = ListNotificationFilters.filterNewPostNotification((ListNotification<Post>) notification, currentSone);
- } else if ("new-repl
ies
-notification".equals(notificationId)) {
+ } else if ("new-repl
y
-notification".equals(notificationId)) {
notification = ListNotificationFilters.filterNewReplyNotification((ListNotification<Reply>) notification, currentSone);
}
if (notification == null) {
notification = ListNotificationFilters.filterNewReplyNotification((ListNotification<Reply>) notification, currentSone);
}
if (notification == null) {