-reactions.storage, +collectionShouts.query, fixes

orm/reaction.py

@@ -10,16 +10,42 @@ class ReactionKind(enum.Enum):
 	DISAGREE = 2 # -1
 	PROOF 	= 3	# +1
 	DISPROOF = 4 # -1
-	ASK		= 5 # +0
+	ASK		= 5 # +0 bookmark
 	PROPOSE	= 6 # +0
-	QUOTE	= 7 # +0
+	QUOTE	= 7 # +0 bookmark
 	COMMENT	= 8 # +0
 	ACCEPT	= 9 # +1
 	REJECT	= 0 # -1
 	LIKE	= 11 # +1
 	DISLIKE	= 12 # -1
-	# TYPE = <reaction index> # rating change guess
+	# TYPE = <reaction index> # rating diff
 
+def kind_to_rate(kind) -> int:
+	if kind in [
+		ReactionKind.AGREE,
+		ReactionKind.LIKE,
+		ReactionKind.PROOF,
+		ReactionKind.ACCEPT
+	]: return 1
+	elif kind in [
+		ReactionKind.DISAGREE,
+		ReactionKind.DISLIKE,
+		ReactionKind.DISPROOF,
+		ReactionKind.REJECT
+	]: return -1
+	else: return 0
+
+def get_bookmarked(reactions):
+    c = 0
+    for r in reactions:
+        c += 1 if r.kind in [ ReactionKind.QUOTE, ReactionKind.ASK] else 0
+    return c
+
+def get_rating(reactions):
+    rating = 0
+    for r in reactions:
+        rating += kind_to_rate(r.kind)
+    return rating
 
 class Reaction(Base):
 	__tablename__ = 'reaction'
@@ -38,13 +64,15 @@ class Reaction(Base):
 
 	@property
 	async def stat(self):
-		reacted = 0
+		reacted = []
 		try:
 			with local_session() as session:
-				reacted = session.query(Reaction).filter(Reaction.replyTo == self.id).count()
+				reacted = session.query(Reaction).filter(Reaction.replyTo == self.id).all()
 		except Exception as e:
 			print(e)
 		return {
-			"viewed": await ViewedStorage.get_reaction(self.slug),
-			"reacted": reacted
+			"viewed": await ViewedStorage.get_reaction(self.id),
+			"reacted": reacted.count(),
+			"rating": get_rating(reacted),
+			"bookmarked": get_bookmarked(reacted)
 		}