fix: make social feed and moderation work with latest dao packages

Signed-off-by: Norman Meier <norman@berty.tech>
gnolang · Sep 19, 2023 · bb9753f · bb9753f
1 parent 1eea98f
commit bb9753f
Show file tree

Hide file tree

Showing 40 changed files with 204 additions and 122 deletions.
diff --git a/examples/gno.land/p/demo/daodao/core/gno.mod b/examples/gno.land/p/demo/daodao/core/gno.mod
diff --git a/examples/gno.land/p/demo/daodao/proposal_single/gno.mod b/examples/gno.land/p/demo/daodao/proposal_single/gno.mod
diff --git a/examples/gno.land/p/demo/daodao/voting_group/gno.mod b/examples/gno.land/p/demo/daodao/voting_group/gno.mod
diff --git a/.../gno.land/p/demo/daodao/core/dao_core.gno → .../p/demo/teritori/daodao/core/dao_core.gno b/.../gno.land/p/demo/daodao/core/dao_core.gno → .../p/demo/teritori/daodao/core/dao_core.gno
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	dao_interfaces "gno.land/p/demo/daodao/interfaces"
+	dao_interfaces "gno.land/p/demo/teritori/daodao/interfaces"
 	"gno.land/p/demo/markdown_utils"
 )
 

diff --git a/...land/p/demo/daodao/core/dao_core_test.gno → ...mo/teritori/daodao/core/dao_core_test.gno b/...land/p/demo/daodao/core/dao_core_test.gno → ...mo/teritori/daodao/core/dao_core_test.gno
@@ -4,7 +4,7 @@ import (
 	"std"
 	"testing"
 
-	dao_interfaces "gno.land/p/demo/daodao/interfaces"
+	dao_interfaces "gno.land/p/demo/teritori/daodao/interfaces"
 )
 
 type votingModule struct {

diff --git a/...es/gno.land/p/demo/daodao/core/errors.gno → ...nd/p/demo/teritori/daodao/core/errors.gno b/...es/gno.land/p/demo/daodao/core/errors.gno → ...nd/p/demo/teritori/daodao/core/errors.gno
diff --git a/...no.land/p/demo/daodao/core/expiration.gno → .../demo/teritori/daodao/core/expiration.gno b/...no.land/p/demo/daodao/core/expiration.gno → .../demo/teritori/daodao/core/expiration.gno
diff --git a/...nd/p/demo/daodao/core/expiration_test.gno → .../teritori/daodao/core/expiration_test.gno b/...nd/p/demo/daodao/core/expiration_test.gno → .../teritori/daodao/core/expiration_test.gno
diff --git a/examples/gno.land/p/demo/teritori/daodao/core/gno.mod b/examples/gno.land/p/demo/teritori/daodao/core/gno.mod
@@ -0,0 +1,7 @@
+module gno.land/p/demo/teritori/daodao/core
+
+require (
+    "gno.land/p/demo/teritori/daodao/interfaces" v0.0.0-latest
+    "gno.land/p/demo/ujson" v0.0.0-latest
+    "gno.land/p/demo/markdown_utils" v0.0.0-latest
+)
diff --git a/.../gno.land/p/demo/daodao/core/messages.gno → .../p/demo/teritori/daodao/core/messages.gno b/.../gno.land/p/demo/daodao/core/messages.gno → .../p/demo/teritori/daodao/core/messages.gno
@@ -1,7 +1,7 @@
 package core
 
 import (
-	dao_interfaces "gno.land/p/demo/daodao/interfaces"
+	dao_interfaces "gno.land/p/demo/teritori/daodao/interfaces"
 	"gno.land/p/demo/ujson"
 )
 
@@ -13,7 +13,7 @@ type UpdateProposalModulesExecutableMessage struct {
 }
 
 func (msg *UpdateProposalModulesExecutableMessage) Type() string {
-	return "gno.land/p/demo/daodao/core.UpdateProposalModules"
+	return "gno.land/p/demo/teritori/daodao/core.UpdateProposalModules"
 }
 
 func (msg *UpdateProposalModulesExecutableMessage) String() string {
@@ -56,7 +56,7 @@ type UpdateVotingModuleExecutableMessage struct {
 }
 
 func (msg *UpdateVotingModuleExecutableMessage) Type() string {
-	return "gno.land/p/demo/daodao/core.UpdateVotingModule"
+	return "gno.land/p/demo/teritori/daodao/core.UpdateVotingModule"
 }
 
 func (msg *UpdateVotingModuleExecutableMessage) String() string {

diff --git a/...no.land/p/demo/daodao/interfaces/core.gno → .../demo/teritori/daodao/interfaces/core.gno b/...no.land/p/demo/daodao/interfaces/core.gno → .../demo/teritori/daodao/interfaces/core.gno
diff --git a/...gno.land/p/demo/daodao/interfaces/gno.mod → ...p/demo/teritori/daodao/interfaces/gno.mod b/...gno.land/p/demo/daodao/interfaces/gno.mod → ...p/demo/teritori/daodao/interfaces/gno.mod
@@ -1,4 +1,4 @@
-module gno.land/p/demo/daodao/interfaces
+module gno.land/p/demo/teritori/daodao/interfaces
 
 require (
         "gno.land/p/demo/ujson" v0.0.0-latest

diff --git a/...and/p/demo/daodao/interfaces/messages.gno → ...o/teritori/daodao/interfaces/messages.gno b/...and/p/demo/daodao/interfaces/messages.gno → ...o/teritori/daodao/interfaces/messages.gno
diff --git a/...o/daodao/interfaces/messages_registry.gno → ...i/daodao/interfaces/messages_registry.gno b/...o/daodao/interfaces/messages_registry.gno → ...i/daodao/interfaces/messages_registry.gno
@@ -65,7 +65,7 @@ type RegisterHandlerExecutableMessage struct {
 }
 
 func (m *RegisterHandlerExecutableMessage) Type() string {
-	return "gno.land/p/demo/daodao/interfaces.RegisterHandler"
+	return "gno.land/p/demo/teritori/daodao/interfaces.RegisterHandler"
 }
 
 func (m *RegisterHandlerExecutableMessage) FromJSON(ast *ujson.JSONASTNode) {
@@ -105,7 +105,7 @@ type RemoveHandlerExecutableMessage struct {
 }
 
 func (m *RemoveHandlerExecutableMessage) Type() string {
-	return "gno.land/p/demo/daodao/interfaces.RemoveHandler"
+	return "gno.land/p/demo/teritori/daodao/interfaces.RemoveHandler"
 }
 
 func (m *RemoveHandlerExecutableMessage) FromJSON(ast *ujson.JSONASTNode) {

diff --git a/...dao/interfaces/messages_registry_test.gno → ...dao/interfaces/messages_registry_test.gno b/...dao/interfaces/messages_registry_test.gno → ...dao/interfaces/messages_registry_test.gno
diff --git a/...mo/daodao/interfaces/messages_testing.gno → ...ri/daodao/interfaces/messages_testing.gno b/...mo/daodao/interfaces/messages_testing.gno → ...ri/daodao/interfaces/messages_testing.gno
diff --git a/...land/p/demo/daodao/interfaces/modules.gno → ...mo/teritori/daodao/interfaces/modules.gno b/...land/p/demo/daodao/interfaces/modules.gno → ...mo/teritori/daodao/interfaces/modules.gno
diff --git a/...o/proposal_single/dao_proposal_single.gno → ...o/proposal_single/dao_proposal_single.gno b/...o/proposal_single/dao_proposal_single.gno → ...o/proposal_single/dao_proposal_single.gno
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"gno.land/p/demo/avl"
-	dao_interfaces "gno.land/p/demo/daodao/interfaces"
+	dao_interfaces "gno.land/p/demo/teritori/daodao/interfaces"
 	"gno.land/p/demo/ujson"
 )
 

diff --git a/examples/gno.land/p/demo/teritori/daodao/proposal_single/gno.mod b/examples/gno.land/p/demo/teritori/daodao/proposal_single/gno.mod
@@ -0,0 +1,7 @@
+module gno.land/p/demo/teritori/daodao/proposal_single
+
+require (
+    "gno.land/p/demo/avl" v0.0.0-latest
+    "gno.land/p/demo/teritori/daodao/interfaces" v0.0.0-latest
+    "gno.land/p/demo/ujson" v0.0.0-latest
+)
diff --git a/.../daodao/proposal_single/proposal_test.gno → .../daodao/proposal_single/proposal_test.gno b/.../daodao/proposal_single/proposal_test.gno → .../daodao/proposal_single/proposal_test.gno
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"gno.land/p/demo/avl"
-	dao_interfaces "gno.land/p/demo/daodao/interfaces"
+	dao_interfaces "gno.land/p/demo/teritori/daodao/interfaces"
 	"gno.land/p/demo/ujson"
 )
 

diff --git a/...demo/daodao/proposal_single/threshold.gno → ...tori/daodao/proposal_single/threshold.gno b/...demo/daodao/proposal_single/threshold.gno → ...tori/daodao/proposal_single/threshold.gno
diff --git a/...d/p/demo/daodao/proposal_single/types.gno → ...teritori/daodao/proposal_single/types.gno b/...d/p/demo/daodao/proposal_single/types.gno → ...teritori/daodao/proposal_single/types.gno
@@ -5,7 +5,7 @@ import (
 	"strconv"
 
 	"gno.land/p/demo/avl"
-	dao_interfaces "gno.land/p/demo/daodao/interfaces"
+	dao_interfaces "gno.land/p/demo/teritori/daodao/interfaces"
 	"gno.land/p/demo/ujson"
 )
 

diff --git a/...aodao/proposal_single/update_settings.gno → ...aodao/proposal_single/update_settings.gno b/...aodao/proposal_single/update_settings.gno → ...aodao/proposal_single/update_settings.gno
@@ -5,7 +5,7 @@ import (
 	"std"
 	"strings"
 
-	"gno.land/p/demo/daodao/interfaces"
+	"gno.land/p/demo/teritori/daodao/interfaces"
 	"gno.land/p/demo/ujson"
 )
 
@@ -18,7 +18,7 @@ type UpdateSettingsMessage struct {
 }
 
 func (usm *UpdateSettingsMessage) Type() string {
-	return "gno.land/p/demo/daodao/proposal_single.UpdateSettings"
+	return "gno.land/p/demo/teritori/daodao/proposal_single.UpdateSettings"
 }
 
 func (usm *UpdateSettingsMessage) String() string {

diff --git a/examples/gno.land/p/demo/teritori/daodao/voting_group/gno.mod b/examples/gno.land/p/demo/teritori/daodao/voting_group/gno.mod
@@ -0,0 +1,7 @@
+module gno.land/p/demo/teritori/daodao/voting_group
+
+require (
+    "gno.land/p/demo/teritori/daodao/interfaces" v0.0.0-latest
+	"gno.land/p/demo/markdown_utils" v0.0.0-latest
+	"gno.land/r/demo/groups" v0.0.0-latest
+)
diff --git a/...demo/daodao/voting_group/voting_group.gno → ...tori/daodao/voting_group/voting_group.gno b/...demo/daodao/voting_group/voting_group.gno → ...tori/daodao/voting_group/voting_group.gno
@@ -3,7 +3,7 @@ package dao_voting_group
 import (
 	"std"
 
-	dao_interfaces "gno.land/p/demo/daodao/interfaces"
+	dao_interfaces "gno.land/p/demo/teritori/daodao/interfaces"
 	"gno.land/p/demo/markdown_utils"
 	"gno.land/r/demo/groups"
 )

diff --git a/...daodao/voting_group/voting_group_test.gno → ...daodao/voting_group/voting_group_test.gno b/...daodao/voting_group/voting_group_test.gno → ...daodao/voting_group/voting_group_test.gno
@@ -4,7 +4,7 @@ import (
 	"std"
 	"testing"
 
-	dao_interfaces "gno.land/p/demo/daodao/interfaces"
+	dao_interfaces "gno.land/p/demo/teritori/daodao/interfaces"
 	"gno.land/r/demo/groups"
 )
 

diff --git a/examples/gno.land/r/demo/dao_realm/dao_realm.gno b/examples/gno.land/r/demo/dao_realm/dao_realm.gno
@@ -6,10 +6,10 @@ import (
 	"strings"
 	"time"
 
-	dao_core "gno.land/p/demo/daodao/core"
-	dao_interfaces "gno.land/p/demo/daodao/interfaces"
-	proposal_single "gno.land/p/demo/daodao/proposal_single"
-	voting_group "gno.land/p/demo/daodao/voting_group"
+	dao_core "gno.land/p/demo/teritori/daodao/core"
+	dao_interfaces "gno.land/p/demo/teritori/daodao/interfaces"
+	proposal_single "gno.land/p/demo/teritori/daodao/proposal_single"
+	voting_group "gno.land/p/demo/teritori/daodao/voting_group"
 	"gno.land/p/demo/ujson"
 	registry "gno.land/r/demo/dao_registry"
 	"gno.land/r/demo/groups"

diff --git a/examples/gno.land/r/demo/dao_realm/dao_realm_test.gno b/examples/gno.land/r/demo/dao_realm/dao_realm_test.gno
@@ -5,9 +5,9 @@ import (
 	"std"
 	"testing"
 
-	dao_core "gno.land/p/demo/daodao/core"
-	dao_interfaces "gno.land/p/demo/daodao/interfaces"
-	proposal_single "gno.land/p/demo/daodao/proposal_single"
+	dao_core "gno.land/p/demo/teritori/daodao/core"
+	dao_interfaces "gno.land/p/demo/teritori/daodao/interfaces"
+	proposal_single "gno.land/p/demo/teritori/daodao/proposal_single"
 	"gno.land/p/demo/ujson"
 	"gno.land/r/demo/groups"
 	modboards "gno.land/r/demo/modboards"
@@ -118,11 +118,11 @@ Offensive stuff
 func TestUpdateSettings(t *testing.T) {
 	// why is state preversed between tests??
 	{
-		id := ProposeJSON(0, fmt.Sprintf(`{"title": "Test prop", "description": "A description", "messages": [{"type": "gno.land/p/demo/daodao/proposal_single.UpdateSettings", "payload": {"threshold": {"thresholdQuorum": {"threshold": {"percent": 200}, "quorum": {"percent": 200}}}}}]}`))
+		id := ProposeJSON(0, fmt.Sprintf(`{"title": "Test prop", "description": "A description", "messages": [{"type": "gno.land/p/demo/teritori/daodao/proposal_single.UpdateSettings", "payload": {"threshold": {"thresholdQuorum": {"threshold": {"percent": 200}, "quorum": {"percent": 200}}}}}]}`))
 		VoteJSON(0, id, fmt.Sprintf(`{"vote": %d, "rationale": "%s"}`, proposal_single.VoteYes, "testing"))
 		Execute(0, id)
 		proposalJSON := getProposalJSON(0, id)
-		expected := `{"id":3,"title":"Test prop","description":"A description","proposer":"g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm","startHeight":123,"threshold":{"thresholdQuorum":{"threshold":{"percent":100},"quorum":{"percent":100}}},"totalPower":5,"messages":[{"type":"gno.land/p/demo/daodao/proposal_single.UpdateSettings","payload":{"threshold":{"thresholdQuorum":{"threshold":{"percent":200},"quorum":{"percent":200}}}}}],"status":"Executed","votes":{"yes":1,"no":0,"abstain":0},"allowRevoting":false,"ballots":{"g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm":{"power":1,"vote":"Yes","rationale":"testing"}}}`
+		expected := `{"id":3,"title":"Test prop","description":"A description","proposer":"g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm","startHeight":123,"threshold":{"thresholdQuorum":{"threshold":{"percent":100},"quorum":{"percent":100}}},"totalPower":5,"messages":[{"type":"gno.land/p/demo/teritori/daodao/proposal_single.UpdateSettings","payload":{"threshold":{"thresholdQuorum":{"threshold":{"percent":200},"quorum":{"percent":200}}}}}],"status":"Executed","votes":{"yes":1,"no":0,"abstain":0},"allowRevoting":false,"ballots":{"g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm":{"power":1,"vote":"Yes","rationale":"testing"}}}`
 		if proposalJSON != expected {
 			t.Fatalf("Expected:\n%s\nGot:\n%s", expected, proposalJSON)
 		}

diff --git a/examples/gno.land/r/demo/dao_realm/gno.mod b/examples/gno.land/r/demo/dao_realm/gno.mod
@@ -1,10 +1,10 @@
 module gno.land/r/demo/dao_realm
 
 require (
-    "gno.land/p/demo/daodao/core" v0.0.0-latest
-    "gno.land/p/demo/daodao/interfaces" v0.0.0-latest
-	"gno.land/p/demo/daodao/proposal_single" v0.0.0-latest
-	"gno.land/p/demo/daodao/voting_group" v0.0.0-latest
+    "gno.land/p/demo/teritori/daodao/core" v0.0.0-latest
+    "gno.land/p/demo/teritori/daodao/interfaces" v0.0.0-latest
+	"gno.land/p/demo/teritori/daodao/proposal_single" v0.0.0-latest
+	"gno.land/p/demo/teritori/daodao/voting_group" v0.0.0-latest
 	"gno.land/r/demo/groups" v0.0.0-latest
 	"gno.land/r/demo/modboards" v0.0.0-latest
 	"gno.land/r/demo/tori" v0.0.0-latest

diff --git a/examples/gno.land/r/demo/groups/gno.mod b/examples/gno.land/r/demo/groups/gno.mod
@@ -5,6 +5,6 @@ require (
         "gno.land/p/demo/havl" v0.0.0-latest
         "gno.land/r/demo/users" v0.0.0-latest
         "gno.land/p/demo/ujson" v0.0.0-latest
-        "gno.land/p/demo/daodao/interfaces" v0.0.0-latest
+        "gno.land/p/demo/teritori/daodao/interfaces" v0.0.0-latest
         "gno.land/r/demo/modboards" v0.0.0-latest
 )
diff --git a/examples/gno.land/r/demo/groups/messages.gno b/examples/gno.land/r/demo/groups/messages.gno
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"gno.land/p/demo/daodao/interfaces"
+	"gno.land/p/demo/teritori/daodao/interfaces"
 	"gno.land/p/demo/ujson"
 )
 

diff --git a/examples/gno.land/r/demo/modboards/gno.mod b/examples/gno.land/r/demo/modboards/gno.mod
@@ -3,7 +3,7 @@ module gno.land/r/demo/modboards
 require (
         "gno.land/p/demo/avl" v0.0.0-latest
         "gno.land/r/demo/users" v0.0.0-latest
-        "gno.land/p/demo/daodao/interfaces" v0.0.0-latest
+        "gno.land/p/demo/teritori/daodao/interfaces" v0.0.0-latest
 	"gno.land/p/demo/ujson" v0.0.0-latest
         "gno.land/p/demo/flags_index" v0.0.0-latest
 )
diff --git a/examples/gno.land/r/demo/modboards/messages.gno b/examples/gno.land/r/demo/modboards/messages.gno
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"gno.land/p/demo/daodao/interfaces"
+	"gno.land/p/demo/teritori/daodao/interfaces"
 	"gno.land/p/demo/ujson"
 )
 

diff --git a/examples/gno.land/r/demo/social_feeds/feed.gno b/examples/gno.land/r/demo/social_feeds/feed.gno
@@ -18,6 +18,18 @@ func (fid FeedID) String() string {
 	return strconv.Itoa(int(fid))
 }
 
+func (fid *FeedID) FromJSON(ast *ujson.JSONASTNode) {
+	val, err := strconv.Atoi(ast.Value)
+	if err != nil {
+		panic(err)
+	}
+	*fid = FeedID(val)
+}
+
+func (fid FeedID) ToJSON() string {
+	return strconv.Itoa(int(fid))
+}
+
 type Feed struct {
 	id        FeedID
 	url       string

diff --git a/examples/gno.land/r/demo/social_feeds/messages.gno b/examples/gno.land/r/demo/social_feeds/messages.gno
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"gno.land/p/demo/daodao/interfaces"
+	"gno.land/p/demo/teritori/daodao/interfaces"
 	"gno.land/p/demo/ujson"
 )
 
@@ -22,7 +22,15 @@ type ExecutableMessageBanPost struct {
 }
 
 func (msg *ExecutableMessageBanPost) Type() string {
-	return "BanPost"
+	return "gno.land/r/demo/social_feeds.BanPost"
+}
+
+func (msg *ExecutableMessageBanPost) ToJSON() string {
+	return ujson.FormatObject([]ujson.FormatKV{
+		{Key: "feedId", Value: msg.FeedID},
+		{Key: "postId", Value: msg.PostID},
+		{Key: "reason", Value: msg.Reason},
+	})
 }
 
 func (msg *ExecutableMessageBanPost) String() string {

diff --git a/examples/gno.land/r/demo/social_feeds/post.gno b/examples/gno.land/r/demo/social_feeds/post.gno
@@ -19,6 +19,18 @@ func (pid PostID) String() string {
 	return strconv.Itoa(int(pid))
 }
 
+func (pid *PostID) FromJSON(ast *ujson.JSONASTNode) {
+	val, err := strconv.Atoi(ast.Value)
+	if err != nil {
+		panic(err)
+	}
+	*pid = PostID(val)
+}
+
+func (pid PostID) ToJSON() string {
+	return strconv.Itoa(int(pid))
+}
+
 type Reaction struct {
 	icon  string
 	count uint64

diff --git a/examples/gno.land/r/demo/social_feeds_dao/gno.mod b/examples/gno.land/r/demo/social_feeds_dao/gno.mod
@@ -2,5 +2,5 @@ module gno.land/r/demo/social_feeds_dao
 
 require (
     "gno.land/r/demo/social_feeds" v0.0.0-latest
-    "gno.land/r/demo/groups_v9" v0.0.0-latest
+    "gno.land/r/demo/groups" v0.0.0-latest
 )