move to ssb gofed fork (#298)

superseriousbusiness · Nov 13, 2021 · 09ef9e6 · 09ef9e6
1 parent 829a934
commit 09ef9e6
Show file tree

Hide file tree

Showing 799 changed files with 6,458 additions and 2,475 deletions.
diff --git a/go.mod b/go.mod
@@ -10,7 +10,6 @@ require (
 	github.com/gin-contrib/cors v1.3.1
 	github.com/gin-contrib/sessions v0.0.3
 	github.com/gin-gonic/gin v1.7.2-0.20210908033055-3a6f18f32f22
-	github.com/go-fed/activity v1.0.1-0.20210803212804-d866ba75dd0f
 	github.com/go-fed/httpsig v1.1.0
 	github.com/go-playground/validator/v10 v10.9.0
 	github.com/google/uuid v1.3.0
@@ -25,6 +24,7 @@ require (
 	github.com/russross/blackfriday/v2 v2.1.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/stretchr/testify v1.7.0
+	github.com/superseriousbusiness/activity v1.0.1-0.20211113133524-56560b73ace8
 	github.com/superseriousbusiness/exifremove v0.0.0-20210330092427-6acd27eac203
 	github.com/superseriousbusiness/oauth2/v4 v4.3.2-SSB
 	github.com/tdewolff/minify/v2 v2.9.21

diff --git a/go.sum b/go.sum
@@ -151,8 +151,6 @@ github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWE
 github.com/go-errors/errors v1.1.1/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
 github.com/go-errors/errors v1.4.0 h1:2OA7MFw38+e9na72T1xgkomPb6GzZzzxvJ5U630FoRM=
 github.com/go-errors/errors v1.4.0/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
-github.com/go-fed/activity v1.0.1-0.20210803212804-d866ba75dd0f h1:etNMc6V75EEoPVbFxXjMb7r6bmIoodXN4McXuPuljLY=
-github.com/go-fed/activity v1.0.1-0.20210803212804-d866ba75dd0f/go.mod h1:v4QoPaAzjWZ8zN2VFVGL5ep9C02mst0hQYHUpQwso4Q=
 github.com/go-fed/httpsig v0.1.1-0.20190914113940-c2de3672e5b5/go.mod h1:T56HUNYZUQ1AGUzhAYPugZfp36sKApVnGBgKlIY+aIE=
 github.com/go-fed/httpsig v1.1.0 h1:9M+hb0jkEICD8/cAiNqEB66R87tTINszBRTjwjQzWcI=
 github.com/go-fed/httpsig v1.1.0/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM=
@@ -445,6 +443,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/superseriousbusiness/activity v1.0.1-0.20211113133524-56560b73ace8 h1:8Bwy6CSsT33/sF5FhjND4vr7jiJCaq4elNTAW4rUzVc=
+github.com/superseriousbusiness/activity v1.0.1-0.20211113133524-56560b73ace8/go.mod h1:ZY9xwFDucvp6zTvM6FQZGl8PSOofPBFIAy6gSc85XkY=
 github.com/superseriousbusiness/exifremove v0.0.0-20210330092427-6acd27eac203 h1:1SWXcTphBQjYGWRRxLFIAR1LVtQEj4eR7xPtyeOVM/c=
 github.com/superseriousbusiness/exifremove v0.0.0-20210330092427-6acd27eac203/go.mod h1:0Xw5cYMOYpgaWs+OOSx41ugycl2qvKTi9tlMMcZhFyY=
 github.com/superseriousbusiness/oauth2/v4 v4.3.2-SSB h1:PtW2w6budTvRV2J5QAoSvThTHBuvh8t/+BXIZFAaBSc=

diff --git a/internal/ap/extract.go b/internal/ap/extract.go
@@ -31,7 +31,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-fed/activity/pub"
+	"github.com/superseriousbusiness/activity/pub"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/util"
 )
@@ -671,3 +671,21 @@ func isFollowers(uris []*url.URL, followersURI string) bool {
 	}
 	return false
 }
+
+// ExtractSensitive extracts whether or not an item is 'sensitive'.
+// If no sensitive property is set on the item at all, or if this property
+// isn't a boolean, then false will be returned by default.
+func ExtractSensitive(withSensitive WithSensitive) bool {
+	sensitiveProp := withSensitive.GetActivityStreamsSensitive()
+	if sensitiveProp == nil {
+		return false
+	}
+
+	for iter := sensitiveProp.Begin(); iter != sensitiveProp.End(); iter = iter.Next() {
+		if iter.IsXMLSchemaBoolean() {
+			return iter.Get()
+		}
+	}
+
+	return false
+}
diff --git a/internal/ap/extract_test.go b/internal/ap/extract_test.go
@@ -22,10 +22,10 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/go-fed/activity/pub"
-	"github.com/go-fed/activity/streams"
-	"github.com/go-fed/activity/streams/vocab"
 	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/activity/pub"
+	"github.com/superseriousbusiness/activity/streams"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 	"github.com/superseriousbusiness/gotosocial/internal/ap"
 	"github.com/superseriousbusiness/gotosocial/testrig"
 )
@@ -49,6 +49,10 @@ func document1() vocab.ActivityStreamsDocument {
 	dBlurhash.Set("UxQ0EkRP_4tRxtRjWBt7%hozM_ayV@oLf6WB")
 	d.SetTootBlurhash(dBlurhash)
 
+	dSensitive := streams.NewActivityStreamsSensitiveProperty()
+	dSensitive.AppendXMLSchemaBoolean(true)
+	d.SetActivityStreamsSensitive(dSensitive)
+
 	return d
 }
 

diff --git a/internal/ap/extractattachments_test.go b/internal/ap/extractattachments_test.go
@@ -21,8 +21,8 @@ package ap_test
 import (
 	"testing"
 
-	"github.com/go-fed/activity/streams"
 	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/activity/streams"
 	"github.com/superseriousbusiness/gotosocial/internal/ap"
 )
 

diff --git a/internal/ap/extractsensitive_test.go b/internal/ap/extractsensitive_test.go
@@ -0,0 +1,42 @@
+/*
+   GoToSocial
+   Copyright (C) 2021 GoToSocial Authors [email protected]
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Affero General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package ap_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/gotosocial/internal/ap"
+)
+
+type ExtractSensitiveTestSuite struct {
+	ExtractTestSuite
+}
+
+func (suite *ExtractMentionsTestSuite) TestExtractSensitive() {
+	d := suite.document1
+	suite.True(ap.ExtractSensitive(d))
+
+	n := suite.noteWithMentions1
+	suite.False(ap.ExtractSensitive(n))
+}
+
+func TestExtractSensitiveTestSuite(t *testing.T) {
+	suite.Run(t, &ExtractSensitiveTestSuite{})
+}
diff --git a/internal/ap/interfaces.go b/internal/ap/interfaces.go
@@ -18,7 +18,7 @@
 
 package ap
 
-import "github.com/go-fed/activity/streams/vocab"
+import "github.com/superseriousbusiness/activity/streams/vocab"
 
 // Accountable represents the minimum activitypub interface for representing an 'account'.
 // This interface is fulfilled by: Person, Application, Organization, Service, and Group
@@ -249,9 +249,9 @@ type WithCC interface {
 	GetActivityStreamsCc() vocab.ActivityStreamsCcProperty
 }
 
-// WithSensitive ...
+// WithSensitive represents an activity with ActivityStreamsSensitiveProperty
 type WithSensitive interface {
-	// TODO
+	GetActivityStreamsSensitive() vocab.ActivityStreamsSensitiveProperty
 }
 
 // WithConversation ...

diff --git a/internal/api/s2s/user/inboxpost_test.go b/internal/api/s2s/user/inboxpost_test.go
@@ -29,9 +29,9 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/go-fed/activity/pub"
-	"github.com/go-fed/activity/streams"
 	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/activity/pub"
+	"github.com/superseriousbusiness/activity/streams"
 	"github.com/superseriousbusiness/gotosocial/internal/api/s2s/user"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"

diff --git a/internal/api/s2s/user/outboxget_test.go b/internal/api/s2s/user/outboxget_test.go
@@ -27,9 +27,9 @@ import (
 	"testing"
 
 	"github.com/gin-gonic/gin"
-	"github.com/go-fed/activity/streams"
-	"github.com/go-fed/activity/streams/vocab"
 	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/activity/streams"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 	"github.com/superseriousbusiness/gotosocial/internal/api/s2s/user"
 	"github.com/superseriousbusiness/gotosocial/testrig"
 )

diff --git a/internal/api/s2s/user/repliesget_test.go b/internal/api/s2s/user/repliesget_test.go
@@ -28,10 +28,10 @@ import (
 	"testing"
 
 	"github.com/gin-gonic/gin"
-	"github.com/go-fed/activity/streams"
-	"github.com/go-fed/activity/streams/vocab"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/activity/streams"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 	"github.com/superseriousbusiness/gotosocial/internal/api/s2s/user"
 	"github.com/superseriousbusiness/gotosocial/testrig"
 )

diff --git a/internal/api/s2s/user/userget_test.go b/internal/api/s2s/user/userget_test.go
@@ -27,10 +27,10 @@ import (
 	"testing"
 
 	"github.com/gin-gonic/gin"
-	"github.com/go-fed/activity/streams"
-	"github.com/go-fed/activity/streams/vocab"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/activity/streams"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 	"github.com/superseriousbusiness/gotosocial/internal/api/s2s/user"
 	"github.com/superseriousbusiness/gotosocial/testrig"
 )

diff --git a/internal/federation/authenticate.go b/internal/federation/authenticate.go
@@ -25,14 +25,15 @@ import (
 	"encoding/pem"
 	"errors"
 	"fmt"
-	"github.com/sirupsen/logrus"
 	"net/url"
 	"strings"
 
-	"github.com/go-fed/activity/pub"
-	"github.com/go-fed/activity/streams"
-	"github.com/go-fed/activity/streams/vocab"
+	"github.com/sirupsen/logrus"
+
 	"github.com/go-fed/httpsig"
+	"github.com/superseriousbusiness/activity/pub"
+	"github.com/superseriousbusiness/activity/streams"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/util"

diff --git a/internal/federation/clock.go b/internal/federation/clock.go
@@ -21,7 +21,7 @@ package federation
 import (
 	"time"
 
-	"github.com/go-fed/activity/pub"
+	"github.com/superseriousbusiness/activity/pub"
 )
 
 /*

diff --git a/internal/federation/commonbehavior.go b/internal/federation/commonbehavior.go
@@ -22,8 +22,8 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/go-fed/activity/streams"
-	"github.com/go-fed/activity/streams/vocab"
+	"github.com/superseriousbusiness/activity/streams"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 )
 
 /*

diff --git a/internal/federation/dereferencing/account.go b/internal/federation/dereferencing/account.go
@@ -26,9 +26,9 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/go-fed/activity/streams"
-	"github.com/go-fed/activity/streams/vocab"
 	"github.com/sirupsen/logrus"
+	"github.com/superseriousbusiness/activity/streams"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 	"github.com/superseriousbusiness/gotosocial/internal/ap"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/id"

diff --git a/internal/federation/dereferencing/collectionpage.go b/internal/federation/dereferencing/collectionpage.go
@@ -25,8 +25,8 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/go-fed/activity/streams"
-	"github.com/go-fed/activity/streams/vocab"
+	"github.com/superseriousbusiness/activity/streams"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 	"github.com/superseriousbusiness/gotosocial/internal/ap"
 )
 

diff --git a/internal/federation/dereferencing/dereferencer_test.go b/internal/federation/dereferencing/dereferencer_test.go
@@ -25,10 +25,10 @@ import (
 	"net/http"
 
 	"codeberg.org/gruf/go-store/kv"
-	"github.com/go-fed/activity/streams"
-	"github.com/go-fed/activity/streams/vocab"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/activity/streams"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing"

diff --git a/internal/federation/dereferencing/status.go b/internal/federation/dereferencing/status.go
@@ -26,9 +26,9 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/go-fed/activity/streams"
-	"github.com/go-fed/activity/streams/vocab"
 	"github.com/sirupsen/logrus"
+	"github.com/superseriousbusiness/activity/streams"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 	"github.com/superseriousbusiness/gotosocial/internal/ap"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/id"

diff --git a/internal/federation/federatingactor.go b/internal/federation/federatingactor.go
@@ -23,8 +23,8 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/go-fed/activity/pub"
-	"github.com/go-fed/activity/streams/vocab"
+	"github.com/superseriousbusiness/activity/pub"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 )
 
 // federatingActor implements the go-fed federating protocol interface

diff --git a/internal/federation/federatingdb/accept.go b/internal/federation/federatingdb/accept.go
@@ -23,8 +23,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/go-fed/activity/streams/vocab"
 	"github.com/sirupsen/logrus"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 	"github.com/superseriousbusiness/gotosocial/internal/ap"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"

diff --git a/internal/federation/federatingdb/announce.go b/internal/federation/federatingdb/announce.go
@@ -22,8 +22,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/go-fed/activity/streams/vocab"
 	"github.com/sirupsen/logrus"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 	"github.com/superseriousbusiness/gotosocial/internal/ap"
 	"github.com/superseriousbusiness/gotosocial/internal/messages"
 )

diff --git a/internal/federation/federatingdb/create.go b/internal/federation/federatingdb/create.go
@@ -24,8 +24,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/go-fed/activity/streams/vocab"
 	"github.com/sirupsen/logrus"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 	"github.com/superseriousbusiness/gotosocial/internal/ap"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"

diff --git a/internal/federation/federatingdb/db.go b/internal/federation/federatingdb/db.go
@@ -23,8 +23,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/go-fed/activity/pub"
-	"github.com/go-fed/activity/streams/vocab"
+	"github.com/superseriousbusiness/activity/pub"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/typeutils"

diff --git a/internal/federation/federatingdb/followers.go b/internal/federation/federatingdb/followers.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/go-fed/activity/streams/vocab"
 	"github.com/sirupsen/logrus"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 )
 

diff --git a/internal/federation/federatingdb/followers_test.go b/internal/federation/federatingdb/followers_test.go
@@ -23,8 +23,8 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/go-fed/activity/streams"
 	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/activity/streams"
 	"github.com/superseriousbusiness/gotosocial/testrig"
 )
 

diff --git a/internal/federation/federatingdb/following.go b/internal/federation/federatingdb/following.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/go-fed/activity/streams/vocab"
 	"github.com/sirupsen/logrus"
+	"github.com/superseriousbusiness/activity/streams/vocab"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 )
 

diff --git a/internal/federation/federatingdb/following_test.go b/internal/federation/federatingdb/following_test.go
@@ -23,8 +23,8 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/go-fed/activity/streams"
 	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/activity/streams"
 	"github.com/superseriousbusiness/gotosocial/testrig"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ package federation @@
     import (
     	"time"
-    	"github.com/go-fed/activity/pub"
+    	"github.com/superseriousbusiness/activity/pub"
     )
     /*
@@ Expand Down @@