Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Application Server
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
20
Issues
20
List
Boards
Labels
Service Desk
Milestones
Merge Requests
4
Merge Requests
4
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ganggo
Application Server
Commits
43ca1b4e
Commit
43ca1b4e
authored
Jul 18, 2017
by
zauberstuhl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename DiasporaHandle into Author
parent
56b06399
Changes
23
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
39 additions
and
43 deletions
+39
-43
app/controllers/search.go
app/controllers/search.go
+1
-1
app/controllers/user.go
app/controllers/user.go
+3
-2
app/controllers/webfinger.go
app/controllers/webfinger.go
+1
-2
app/helpers/configuration.go
app/helpers/configuration.go
+1
-1
app/helpers/parse_strings.go
app/helpers/parse_strings.go
+1
-1
app/jobs/dispatch_comment.go
app/jobs/dispatch_comment.go
+5
-5
app/jobs/dispatch_like.go
app/jobs/dispatch_like.go
+3
-3
app/jobs/dispatch_post.go
app/jobs/dispatch_post.go
+2
-3
app/jobs/dispatcher.go
app/jobs/dispatcher.go
+1
-2
app/jobs/fetch_author.go
app/jobs/fetch_author.go
+1
-1
app/jobs/receiver.go
app/jobs/receiver.go
+3
-3
app/jobs/relay_comment.go
app/jobs/relay_comment.go
+2
-2
app/models/comments.go
app/models/comments.go
+1
-2
app/models/contacts.go
app/models/contacts.go
+2
-2
app/models/init.go
app/models/init.go
+2
-2
app/models/likes.go
app/models/likes.go
+1
-2
app/models/posts.go
app/models/posts.go
+1
-1
app/models/profiles.go
app/models/profiles.go
+3
-3
app/views/profile/index.html
app/views/profile/index.html
+1
-1
app/views/stream/comment.html
app/views/stream/comment.html
+1
-1
app/views/stream/post.html
app/views/stream/post.html
+1
-1
app/views/stream/reshare.html
app/views/stream/reshare.html
+1
-1
app/views/template.go
app/views/template.go
+1
-1
No files found.
app/controllers/search.go
View file @
43ca1b4e
...
...
@@ -31,7 +31,7 @@ func (s Search) Create() revel.Result {
var
searchText
string
s
.
Params
.
Bind
(
&
searchText
,
"search"
)
_
,
_
,
err
:=
helpers
.
Parse
DiasporaHandle
(
searchText
)
_
,
_
,
err
:=
helpers
.
Parse
Author
(
searchText
)
if
err
!=
nil
{
return
s
.
Redirect
(
Stream
.
Index
)
}
...
...
app/controllers/user.go
View file @
43ca1b4e
...
...
@@ -140,10 +140,11 @@ func (u User) Create() revel.Result {
EncryptedPassword
:
string
(
passwordEncoded
),
Person
:
models
.
Person
{
Guid
:
guid
,
DiasporaHandle
:
username
+
"@"
+
host
,
Author
:
username
+
"@"
+
host
,
SerializedPublicKey
:
string
(
pubEncoded
),
Profile
:
models
.
Profile
{
DiasporaHandle
:
username
+
"@"
+
host
,
Author
:
username
+
"@"
+
host
,
Searchable
:
true
,
ImageUrl
:
"/public/img/avatar.png"
,
},
},
...
...
app/controllers/webfinger.go
View file @
43ca1b4e
...
...
@@ -69,8 +69,7 @@ func (c Webfinger) Webfinger() revel.Result {
defer
db
.
Close
()
var
person
models
.
Person
err
=
db
.
Where
(
"diaspora_handle = ?"
,
username
+
"@"
+
address
)
.
First
(
&
person
)
.
Error
err
=
db
.
Where
(
"author = ?"
,
username
+
"@"
+
address
)
.
First
(
&
person
)
.
Error
if
err
!=
nil
{
c
.
Response
.
Status
=
http
.
StatusNotFound
revel
.
TRACE
.
Println
(
err
)
...
...
app/helpers/configuration.go
View file @
43ca1b4e
...
...
@@ -26,7 +26,7 @@ func IsLocalHandle(handle string) bool {
panic
(
"No server address configured"
)
}
_
,
host
,
err
:=
Parse
DiasporaHandle
(
handle
)
_
,
host
,
err
:=
Parse
Author
(
handle
)
if
err
!=
nil
{
panic
(
"Cannot parse diaspora handle"
)
}
...
...
app/helpers/parse_strings.go
View file @
43ca1b4e
...
...
@@ -22,7 +22,7 @@ import (
"errors"
)
func
Parse
DiasporaHandle
(
handle
string
)
(
string
,
string
,
error
)
{
func
Parse
Author
(
handle
string
)
(
string
,
string
,
error
)
{
parts
,
err
:=
_ParseStringHelper
(
handle
,
`^(.+?)@(.+?)$`
,
2
)
if
err
!=
nil
{
return
""
,
""
,
err
...
...
app/jobs/dispatch_comment.go
View file @
43ca1b4e
...
...
@@ -30,7 +30,7 @@ import (
_
"github.com/jinzhu/gorm/dialects/sqlite"
)
const
COMMENT_SIG_ORDER
=
"
diaspora_handle
guid parent_guid text"
const
COMMENT_SIG_ORDER
=
"
author
guid parent_guid text"
func
(
d
*
Dispatcher
)
Comment
(
comment
*
federation
.
EntityComment
)
{
db
,
err
:=
gorm
.
Open
(
models
.
DB
.
Driver
,
models
.
DB
.
Url
)
...
...
@@ -46,7 +46,7 @@ func (d *Dispatcher) Comment(comment *federation.EntityComment) {
return
}
(
*
comment
)
.
DiasporaHandle
=
d
.
User
.
Person
.
DiasporaHandle
(
*
comment
)
.
Author
=
d
.
User
.
Person
.
Author
(
*
comment
)
.
Guid
=
guid
authorSig
,
err
:=
federation
.
AuthorSignature
(
...
...
@@ -99,18 +99,18 @@ func (d *Dispatcher) Comment(comment *federation.EntityComment) {
revel
.
TRACE
.
Println
(
"entityXml"
,
string
(
entityXml
))
if
helpers
.
IsLocalHandle
(
d
.
ParentPerson
.
DiasporaHandle
)
{
if
helpers
.
IsLocalHandle
(
d
.
ParentPerson
.
Author
)
{
var
visibility
models
.
AspectVisibility
err
=
visibility
.
FindByParentGuid
(
comment
.
ParentGuid
)
if
err
!=
nil
{
revel
.
ERROR
.
Println
(
err
)
return
}
sendToAspect
(
visibility
.
AspectID
,
d
.
User
.
SerializedPrivateKey
,
comment
.
DiasporaHandle
,
entityXml
)
sendToAspect
(
visibility
.
AspectID
,
d
.
User
.
SerializedPrivateKey
,
comment
.
Author
,
entityXml
)
}
else
{
payload
,
err
:=
federation
.
MagicEnvelope
(
(
*
d
)
.
User
.
SerializedPrivateKey
,
(
*
comment
)
.
DiasporaHandle
,
(
*
comment
)
.
Author
,
entityXml
,
);
if
err
!=
nil
{
revel
.
ERROR
.
Println
(
err
)
...
...
app/jobs/dispatch_like.go
View file @
43ca1b4e
...
...
@@ -23,7 +23,8 @@ import (
federation
"gopkg.in/ganggo/federation.v0"
)
const
LIKE_SIG_ORDER
=
"positive guid parent_guid target_type diaspora_handle"
// XXX remove and replace with database sort
const
LIKE_SIG_ORDER
=
"positive guid parent_guid target_type author"
func
(
d
*
Dispatcher
)
Like
(
like
*
federation
.
EntityLike
)
{
authorSig
,
err
:=
federation
.
AuthorSignature
(
...
...
@@ -59,8 +60,7 @@ func (d *Dispatcher) Like(like *federation.EntityLike) {
payload
,
err
:=
federation
.
MagicEnvelope
(
(
*
d
)
.
User
.
SerializedPrivateKey
,
(
*
like
)
.
DiasporaHandle
,
entityXml
,
like
.
Author
,
entityXml
,
)
// send it to the network
...
...
app/jobs/dispatch_post.go
View file @
43ca1b4e
...
...
@@ -39,13 +39,12 @@ func (d *Dispatcher) Post(post *federation.EntityStatusMessage) {
if
d
.
AspectID
>
0
{
sendToAspect
(
d
.
AspectID
,
(
*
d
)
.
User
.
SerializedPrivateKey
,
(
*
post
)
.
DiasporaHandle
,
entityXml
,
post
.
Author
,
entityXml
,
)
}
else
{
payload
,
err
:=
federation
.
MagicEnvelope
(
(
*
d
)
.
User
.
SerializedPrivateKey
,
(
*
post
)
.
DiasporaHandle
,
entityXml
,
post
.
Author
,
entityXml
,
);
if
err
!=
nil
{
revel
.
ERROR
.
Println
(
err
)
return
...
...
app/jobs/dispatcher.go
View file @
43ca1b4e
...
...
@@ -90,7 +90,7 @@ func sendToAspect(aspectID uint, priv, handle string, xml []byte) {
continue
}
_
,
host
,
err
:=
helpers
.
Parse
DiasporaHandle
(
person
.
DiasporaHandle
)
_
,
host
,
err
:=
helpers
.
Parse
Author
(
person
.
Author
)
if
err
!=
nil
{
revel
.
ERROR
.
Println
(
err
)
continue
...
...
@@ -108,7 +108,6 @@ func sendToAspect(aspectID uint, priv, handle string, xml []byte) {
func
send
(
wg
*
sync
.
WaitGroup
,
host
,
guid
string
,
payload
[]
byte
)
{
var
err
error
revel
.
Config
.
SetSection
(
"ganggo"
)
localhost
,
found
:=
revel
.
Config
.
String
(
"address"
)
if
!
found
{
...
...
app/jobs/fetch_author.go
View file @
43ca1b4e
...
...
@@ -50,7 +50,7 @@ func (f *FetchAuthor) Run() {
}
defer
db
.
Close
()
_
,
host
,
err
:=
helpers
.
Parse
DiasporaHandle
((
*
f
)
.
Author
)
_
,
host
,
err
:=
helpers
.
Parse
Author
(
f
.
Author
)
if
err
!=
nil
{
revel
.
ERROR
.
Println
(
err
)
(
*
f
)
.
Err
=
err
...
...
app/jobs/receiver.go
View file @
43ca1b4e
...
...
@@ -92,8 +92,8 @@ func (r *Receiver) Run() {
revel
.
TRACE
.
Println
(
"Found a profile entity"
)
insert
:=
db
.
Where
(
"
diaspora_handle
= ?"
,
r
.
Entity
.
Post
.
Profile
.
DiasporaHandle
,
insert
:=
db
.
Where
(
"
author
= ?"
,
profileEntity
.
Author
,
)
.
First
(
&
profile
)
.
RecordNotFound
()
err
:=
profile
.
Cast
(
r
.
Entity
.
Post
.
Profile
)
...
...
@@ -103,7 +103,7 @@ func (r *Receiver) Run() {
}
if
!
strings
.
HasPrefix
(
profile
.
ImageUrl
,
"http"
)
{
_
,
host
,
err
:=
helpers
.
Parse
DiasporaHandle
(
profile
.
DiasporaHandle
)
_
,
host
,
err
:=
helpers
.
Parse
Author
(
profile
.
Author
)
if
err
!=
nil
{
revel
.
ERROR
.
Println
(
err
)
return
...
...
app/jobs/relay_comment.go
View file @
43ca1b4e
...
...
@@ -85,14 +85,14 @@ func (r *Receiver) RelayComment(user models.User, visibilities models.AspectVisi
payload
,
err
:=
federation
.
EncryptedMagicEnvelope
(
user
.
SerializedPrivateKey
,
person
.
SerializedPublicKey
,
user
.
Person
.
DiasporaHandle
,
user
.
Person
.
Author
,
entityCommentXml
,
);
if
err
!=
nil
{
revel
.
ERROR
.
Println
(
err
)
return
}
_
,
host
,
err
:=
helpers
.
Parse
DiasporaHandle
(
person
.
DiasporaHandle
)
_
,
host
,
err
:=
helpers
.
Parse
Author
(
person
.
Author
)
if
err
!=
nil
{
revel
.
ERROR
.
Println
(
err
)
continue
...
...
app/models/comments.go
View file @
43ca1b4e
...
...
@@ -87,8 +87,7 @@ func (c *Comment) Cast(entity *federation.EntityComment) (err error) {
return
}
var
person
Person
err
=
db
.
Where
(
"diaspora_handle = ?"
,
entity
.
DiasporaHandle
)
.
First
(
&
person
)
.
Error
err
=
db
.
Where
(
"author = ?"
,
entity
.
Author
)
.
First
(
&
person
)
.
Error
if
err
!=
nil
{
return
}
...
...
app/models/contacts.go
View file @
43ca1b4e
...
...
@@ -48,7 +48,7 @@ func (c *Contact) Cast(entity *federation.EntityRequest) (err error) {
}
defer
db
.
Close
()
username
,
_
,
err
:=
helpers
.
Parse
DiasporaHandle
(
entity
.
Recipient
)
username
,
_
,
err
:=
helpers
.
Parse
Author
(
entity
.
Recipient
)
if
err
!=
nil
{
return
err
}
...
...
@@ -59,7 +59,7 @@ func (c *Contact) Cast(entity *federation.EntityRequest) (err error) {
return
}
err
=
db
.
Where
(
"
diaspora_handle = ?"
,
entity
.
Sende
r
)
.
First
(
&
sender
)
.
Error
err
=
db
.
Where
(
"
author = ?"
,
entity
.
Autho
r
)
.
First
(
&
sender
)
.
Error
if
err
!=
nil
{
return
}
...
...
app/models/init.go
View file @
43ca1b4e
...
...
@@ -75,13 +75,13 @@ func InitDB() {
profile
:=
&
Profile
{}
db
.
Model
(
profile
)
.
AddUniqueIndex
(
"index_profiles_on_person_id"
,
"person_id"
)
db
.
Model
(
profile
)
.
AddUniqueIndex
(
"index_profiles_on_
diaspora_handle"
,
"diaspora_handle
"
)
db
.
Model
(
profile
)
.
AddUniqueIndex
(
"index_profiles_on_
author"
,
"author
"
)
db
.
Model
(
profile
)
.
AddIndex
(
"index_profiles_on_full_name_and_searchable"
,
"full_name"
,
"searchable"
)
db
.
Model
(
profile
)
.
AddIndex
(
"index_profiles_on_full_name"
,
"full_name"
)
db
.
AutoMigrate
(
profile
)
person
:=
&
Person
{}
db
.
Model
(
person
)
.
AddUniqueIndex
(
"index_people_on_
diaspora_handle"
,
"diaspora_handle
"
)
db
.
Model
(
person
)
.
AddUniqueIndex
(
"index_people_on_
author"
,
"author
"
)
db
.
Model
(
person
)
.
AddUniqueIndex
(
"index_people_on_guid"
,
"guid"
)
// NOTE not every person is a local user
//db.Model(person).AddUniqueIndex("index_people_on_user_id", "user_id")
...
...
app/models/likes.go
View file @
43ca1b4e
...
...
@@ -75,8 +75,7 @@ func (l *Like) Cast(entity *federation.EntityLike) (err error) {
return
}
err
=
db
.
Where
(
"diaspora_handle = ?"
,
entity
.
DiasporaHandle
)
.
First
(
&
person
)
.
Error
err
=
db
.
Where
(
"author = ?"
,
entity
.
Author
)
.
First
(
&
person
)
.
Error
if
err
!=
nil
{
return
}
...
...
app/models/posts.go
View file @
43ca1b4e
...
...
@@ -94,7 +94,7 @@ func (p *Post) Cast(post, reshare *federation.EntityStatusMessage) (err error) {
defer
db
.
Close
()
var
person
Person
err
=
db
.
Where
(
"
diaspora_handle = ?"
,
entity
.
DiasporaHandle
)
.
First
(
&
person
)
.
Error
err
=
db
.
Where
(
"
author = ?"
,
entity
.
Author
)
.
First
(
&
person
)
.
Error
if
err
!=
nil
{
return
}
...
...
app/models/profiles.go
View file @
43ca1b4e
...
...
@@ -59,7 +59,7 @@ func (p *Profile) Cast(entity *federation.EntityProfile) (err error) {
defer
db
.
Close
()
var
person
Person
err
=
db
.
Where
(
"
diaspora_handle = ?"
,
entity
.
DiasporaHandle
)
.
First
(
&
person
)
.
Error
err
=
db
.
Where
(
"
author = ?"
,
entity
.
Author
)
.
First
(
&
person
)
.
Error
if
err
!=
nil
{
return
}
...
...
@@ -69,7 +69,7 @@ func (p *Profile) Cast(entity *federation.EntityProfile) (err error) {
(
*
p
)
.
Birthday
=
birthday
}
(
*
p
)
.
DiasporaHandle
=
entity
.
DiasporaHandle
(
*
p
)
.
Author
=
entity
.
Author
(
*
p
)
.
FirstName
=
entity
.
FirstName
(
*
p
)
.
LastName
=
entity
.
LastName
(
*
p
)
.
ImageUrl
=
entity
.
ImageUrl
...
...
@@ -87,7 +87,7 @@ func (p *Profile) Cast(entity *federation.EntityProfile) (err error) {
}
func
(
p
Profile
)
Nickname
()
(
nickname
string
)
{
nickname
,
_
,
_
=
helpers
.
Parse
DiasporaHandle
(
p
.
DiasporaHandle
)
nickname
,
_
,
_
=
helpers
.
Parse
Author
(
p
.
Author
)
return
}
...
...
app/views/profile/index.html
View file @
43ca1b4e
...
...
@@ -12,7 +12,7 @@
<img
src=
"{{$profile.ImageUrl}}"
border=
"0"
/>
</div>
</header>
<h2>
{{$profile.
DiasporaHandle
}}
</h2>
<h2>
{{$profile.
Author
}}
</h2>
<hr/>
<form
id=
"create-aspect"
>
<input
type=
"text"
style=
"display:none"
id=
"personId"
value=
"{{.person.ID}}"
>
...
...
app/views/stream/comment.html
View file @
43ca1b4e
...
...
@@ -11,7 +11,7 @@
<div
class=
"panel panel-default arrow left"
>
<div
class=
"panel-body"
>
<header
class=
"text-left"
>
<div
class=
"comment-user"
><span
class=
"glyphicon glyphicon-user"
aria-hidden=
"true"
></span>
{[{Person.
DiasporaHandle
}]}
</div>
<div
class=
"comment-user"
><span
class=
"glyphicon glyphicon-user"
aria-hidden=
"true"
></span>
{[{Person.
Author
}]}
</div>
<time
class=
"comment-date"
datetime=
"{[{CreatedAt}]}"
><span
class=
"glyphicon glyphicon-time"
aria-hidden=
"true"
></span>
{[{CreatedAt}]}
</time>
</header>
<div
class=
"comment-post"
>
...
...
app/views/stream/post.html
View file @
43ca1b4e
...
...
@@ -11,7 +11,7 @@
<div
class=
"panel panel-default arrow left"
>
<div
class=
"panel-body"
>
<header
class=
"text-left"
>
<div
class=
"comment-user"
><span
class=
"glyphicon glyphicon-user"
aria-hidden=
"true"
></span>
{[{Profile.
DiasporaHandle
}]}
</div>
<div
class=
"comment-user"
><span
class=
"glyphicon glyphicon-user"
aria-hidden=
"true"
></span>
{[{Profile.
Author
}]}
</div>
<time
class=
"comment-date"
datetime=
"{[{CreatedAt}]}"
><span
class=
"glyphicon glyphicon-time"
aria-hidden=
"true"
></span>
{[{CreatedAt}]}
</time>
</header>
<div
class=
"comment-post"
>
...
...
app/views/stream/reshare.html
View file @
43ca1b4e
...
...
@@ -2,6 +2,6 @@
{{$profile := $person.Profile}}
<div
class=
"bs-callout bs-callout-info"
>
<h4
id=
"callout-progress-csp"
>
{{$profile.
DiasporaHandle
}}
</h4>
<h4
id=
"callout-progress-csp"
>
{{$profile.
Author
}}
</h4>
<p
class=
"markdown"
>
{{.Text}}
</p>
</div>
app/views/template.go
View file @
43ca1b4e
...
...
@@ -92,7 +92,7 @@ var TemplateFuncs = map[string]interface{}{
},
// string parse helper
"HostFromHandle"
:
func
(
handle
string
)
(
host
string
)
{
_
,
host
,
err
:=
helpers
.
Parse
DiasporaHandle
(
handle
)
_
,
host
,
err
:=
helpers
.
Parse
Author
(
handle
)
if
err
!=
nil
{
revel
.
ERROR
.
Println
(
err
)
return
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment