mirror of
https://gitlab.com/chicken-riders/RcGcDw.git
synced 2025-02-23 00:24:09 +00:00
Merge branch 'testing' into 'unstable'
# Conflicts: # rcgcdw.py
This commit is contained in:
commit
e0e37ee150
|
@ -681,7 +681,7 @@ class recent_changes_class(object):
|
||||||
def add_cache(self, change):
|
def add_cache(self, change):
|
||||||
self.ids.append(change["rcid"])
|
self.ids.append(change["rcid"])
|
||||||
#self.recent_id = change["rcid"]
|
#self.recent_id = change["rcid"]
|
||||||
if len(self.ids) > settings["limit"]+5:
|
if len(self.ids) > settings["limitrefetch"]+5:
|
||||||
self.ids.pop(0)
|
self.ids.pop(0)
|
||||||
|
|
||||||
def fetch(self, amount=settings["limit"]):
|
def fetch(self, amount=settings["limit"]):
|
||||||
|
@ -736,8 +736,11 @@ class recent_changes_class(object):
|
||||||
self.streak = -1
|
self.streak = -1
|
||||||
send(_("Connection to {wiki} seems to be stable now.").format(wiki=settings["wikiname"]), _("Connection status"), settings["avatars"]["connection_restored"])
|
send(_("Connection to {wiki} seems to be stable now.").format(wiki=settings["wikiname"]), _("Connection status"), settings["avatars"]["connection_restored"])
|
||||||
for change in changes:
|
for change in changes:
|
||||||
if change["rcid"] in self.ids:
|
if change["rcid"] in self.ids or change["rcid"] < self.recent_id:
|
||||||
|
logging.debug("Change ({}) is in ids or is lower than recent_id {}".format(change["rcid"], self.recent_id))
|
||||||
continue
|
continue
|
||||||
|
logging.debug(self.ids)
|
||||||
|
logging.debug(self.recent_id)
|
||||||
self.add_cache(change)
|
self.add_cache(change)
|
||||||
if clean and not (self.recent_id == 0 and change["rcid"] > self.file_id):
|
if clean and not (self.recent_id == 0 and change["rcid"] > self.file_id):
|
||||||
logging.debug("Rejected {val}".format(val=change["rcid"]))
|
logging.debug("Rejected {val}".format(val=change["rcid"]))
|
||||||
|
|
|
@ -46,11 +46,11 @@
|
||||||
"color":null
|
"color":null
|
||||||
},
|
},
|
||||||
"delete/delete":{
|
"delete/delete":{
|
||||||
"icon":"https://i.imgur.com/C4H84Kp.jpg",
|
"icon":"https://i.imgur.com/BU77GD3.png",
|
||||||
"color":1
|
"color":1
|
||||||
},
|
},
|
||||||
"delete/delete_redir":{
|
"delete/delete_redir":{
|
||||||
"icon":"https://i.imgur.com/C4H84Kp.jpg",
|
"icon":"https://i.imgur.com/BU77GD3.png",
|
||||||
"color":1
|
"color":1
|
||||||
},
|
},
|
||||||
"delete/restore":{
|
"delete/restore":{
|
||||||
|
|
Loading…
Reference in a new issue