Custom badges

Author: easafe

src/Server/Database/Badges.purs

@@ -8,8 +8,8 @@ import Type.Proxy (Proxy(..))
 
 type Badges =
       ( id ∷ Column Int (PrimaryKey /\ Identity)
-      , kind ∷ Badge
-      , description ∷ String
+      , kind ∷ Int
+      , description ∷ Badge
       )
 
 type BadgesTable = Table "badges" Badges

src/Server/Im/Database.purs

@@ -67,7 +67,7 @@ userFields =
             /\ _description
             /\ (select _name # from countries # wher (_id .=. u ... _country) # orderBy _id # limit (Proxy ∷ _ 1) # as _country)
             /\ (select (array_agg _feature # as _privileges) # from privileges # wher (_quantity .<=. k ... _current_karma) # orderBy _privileges # limit (Proxy ∷ _ 1))
-            /\ (select (array_agg _kind # as _badges) # from (((badges # as b) `join` (badges_users # as bu)) # on (b ... _id .=. bu ... _badge .&&. bu ... _receiver .=. u ... _id)) # orderBy _badges # limit (Proxy ∷ _ 1))
+            /\ (select (array_agg _description # as _badges) # from (((badges # as b) `join` (badges_users # as bu)) # on (b ... _id .=. bu ... _badge .&&. bu ... _receiver .=. u ... _id)) # orderBy _badges # limit (Proxy ∷ _ 1))
             /\ (select (array_agg (l ... _name # orderBy (l ... _id)) # as _tags) # from (((tags # as l) `join` (tags_users # as tu)) # on (l ... _id .=. tu ... _tag .&&. tu ... _creator .=. u ... _id)) # orderBy _tags # limit (Proxy ∷ _ 1))
             /\ (k ... _current_karma # as _karma)
             /\ (_position # as _karmaPosition)
@@ -148,7 +148,7 @@ presentUserContactFields =
       , description
       , (SELECT name FROM countries WHERE id = u.country) country
       , (SELECT ARRAY_AGG(l.name ORDER BY name) FROM languages l JOIN languages_users lu ON l.id = lu.language AND lu.speaker = u.id) languages
-      , (SELECT ARRAY_AGG(kind) FROM badges b JOIN badges_users bu ON b.id = bu.badge AND bu.receiver = u.id) badges
+      , (SELECT ARRAY_AGG(description) FROM badges b JOIN badges_users bu ON b.id = bu.badge AND bu.receiver = u.id) badges
       , (SELECT ARRAY_AGG(t.name ORDER BY t.id) FROM tags t JOIN tags_users tu ON t.id = tu.tag AND tu.creator = u.id) tags
       , k.current_karma karma
       , position "karmaPosition"

src/Server/Profile/Database.purs

@@ -42,7 +42,7 @@ presentProfile loggedUserId = map SU.fromJust <<< SD.single $ select profilePres
             /\ (select (array_agg _feature # as _privileges) # from privileges # wher (_quantity .<=. k ... _current_karma) # orderBy _privileges # limit (Proxy ∷ _ 1))
             /\ (select (array_agg (l ... _id) # as _languages) # from (((languages # as l) `join` (languages_users # as lu)) # on (l ... _id .=. lu ... _language .&&. lu ... _speaker .=. u ... _id)) # orderBy _languages # limit (Proxy ∷ _ 1))
             /\ (select (array_agg (l ... _name # orderBy (l ... _id)) # as _tags) # from (((tags # as l) `join` (tags_users # as tu)) # on (l ... _id .=. tu ... _tag .&&. tu ... _creator .=. u ... _id)) # orderBy _tags # limit (Proxy ∷ _ 1))
-            /\ (select (array_agg _kind # as _badges) # from (((badges # as b) `join` (badges_users # as bu)) # on (b ... _id .=. bu ... _badge .&&. bu ... _receiver .=. u ... _id)) # orderBy _badges # limit (Proxy ∷ _ 1))
+            /\ (select (array_agg _description # as _badges) # from (((badges # as b) `join` (badges_users # as bu)) # on (b ... _id .=. bu ... _badge .&&. bu ... _receiver .=. u ... _id)) # orderBy _badges # limit (Proxy ∷ _ 1))
             /\ (k ... _current_karma # as _karma)
             /\ (_position # as _karmaPosition)
       source = join (users # as u) (karma_leaderboard # as k) # on (u ... _id .=. k ... _ranker)

src/Shared/Badge.purs

@@ -20,6 +20,7 @@ import Simple.JSON (class ReadForeign, class WriteForeign)
 data Badge
       = Admin
       | Contributor
+      | Custom String
 
 derive instance Eq Badge
 
@@ -35,43 +36,53 @@ instance EncodeJson Badge where
 
 instance Bounded Badge where
       bottom = Admin
-      top = Contributor
+      top = Custom ""
 
 instance BoundedEnum Badge where
       cardinality = Cardinality 1
 
       fromEnum = case _ of
             Admin → 0
             Contributor → 100
+            Custom _ → 200
 
       toEnum = case _ of
             0 → Just Admin
             100 → Just Contributor
+            200 → Just $ Custom ""
             _ → Nothing
 
 instance Enum Badge where
       succ = case _ of
             Admin → Just Contributor
-            Contributor → Nothing
+            Contributor → Just $ Custom ""
+            Custom _ → Nothing
 
       pred = case _ of
             Admin → Nothing
             Contributor → Just Admin
+            Custom _ → Just Contributor
 
 instance Show Badge where
-      show = DSG.genericShow
+      show = case _ of
+            Admin → "Admin"
+            Contributor → "Contributor"
+            Custom c → c
+
+unshow :: String -> Badge
+unshow = case _ of
+            "Admin" → Admin
+            "Contributor" → Contributor
+            c → Custom c
 
 instance ReadForeign Badge where
-      readImpl f = SU.fromJust <<< DE.toEnum <$> F.readInt f
+      readImpl f = unshow <$> F.readString f
 
 instance WriteForeign Badge where
-      writeImpl = F.unsafeToForeign <<< DE.fromEnum
-
-instance ToValue Badge where
-      toValue = F.unsafeToForeign <<< DE.fromEnum
+      writeImpl = F.unsafeToForeign <<< show
 
 instance FromValue Badge where
-      fromValue v = map (SU.fromJust <<< DE.toEnum) (DL.fromValue v ∷ Either String Int)
+      fromValue v = map unshow (DL.fromValue v ∷ Either String String)
 
 type BadgeUser =
       { badge ∷ Badge
@@ -91,4 +102,9 @@ badgeFor b = case b of
             , text: "Contributor"
             , description: "This user has contributed to MeroChat"
             }
+      Custom c →
+            { badge: b
+            , text: c
+            , description: "Special user badge: " <> c
+            }