Move the task creation detection code above the comment detection code, and don't run the latter if the former is true.

This commit is contained in:
Simon Quigley 2018-05-20 12:45:30 -05:00
parent 643cec641d
commit 263d4ec192

54
lugito
View File

@ -84,35 +84,37 @@ def main():
taskexists = False taskexists = False
if taskexists: if taskexists:
commentid = None # First, let's see if it's a new task
edited = False
# Let's see if this was a comment and if it's just an edit
for task in tasksearch:
dataepoch = data["action"]["epoch"]
datemodified = task["dateModified"]
if datemodified >= (dataepoch - 10) and datemodified <= (dataepoch + 10) and task["comments"] != []:
comment = True
commentid = task["id"]
if datemodified != task["dateCreated"]:
edited = True
else:
edited = False
break
else:
comment = False
newcomment = False newcomment = False
epoch = False epoch = False
if not comment and not edited: for task in tasksearch:
for task in tasksearch: if epoch:
if epoch: if task["dateCreated"] == task["dateModified"] and task["dateCreated"] == epoch:
if task["dateCreated"] == task["dateModified"] and task["dateCreated"] == epoch: newcomment = True
newcomment = True
else:
newcomment = False
break
else: else:
epoch = task["dateCreated"] newcomment = False
break
else:
epoch = task["dateCreated"]
# If it's not a new task, let's see if it's a comment, and if it's just an edit
if not newcomment:
commentid = None
edited = False
for task in tasksearch:
dataepoch = data["action"]["epoch"]
datemodified = task["dateModified"]
if datemodified >= (dataepoch - 10) and datemodified <= (dataepoch + 10) and task["comments"] != []:
comment = True
commentid = task["id"]
if datemodified != task["dateCreated"]:
edited = True
else:
edited = False
break
else:
comment = False
# We should also know who did this thing # We should also know who did this thing
userlookup = tasksearch[0]["authorPHID"] userlookup = tasksearch[0]["authorPHID"]