cwtch.im
/
cwtch
16
20
Fork 16
Code Issues 10 Pull Requests 2 Releases 163 Wiki Activity

Integrate Group Name into Invite #336

Merged
dan merged 1 commits from group_create_ui into master 2020-12-17 05:54:03 +00:00
Conversation 2 Commits 1 Files Changed 10 +41 -13
sarah commented 2020-12-17 03:13:11 +00:00
Owner
Copy Link
No description provided.
dan was assigned by sarah 2020-12-17 03:13:11 +00:00
buildbot commented 2020-12-17 03:20:08 +00:00
Member
Copy Link

Drone Build Status: success

https://build.openprivacy.ca/cwtch.im/cwtch/932

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/cwtch/932
dan requested changes 2020-12-17 05:35:49 +00:00
model/group.go Outdated
@ -97,2 +101,3 @@
gci := &groups.GroupInvite{
GroupName: g.GroupID,
GroupID: g.GroupID,
GroupName: g.Attributes[attr.GetLocalScope("name")],
dan commented 2020-12-17 05:26:48 +00:00
Owner
Copy Link

for ease and safety of reuseability from clients, might want to replace "name" with a const in model/group.go ... Name

for ease and safety of reuseability from clients, might want to replace "name" with a const in model/group.go ... Name
sarah commented 2020-12-17 05:40:03 +00:00
Author
Owner
Copy Link

This needs a wider rethink as we are technically crossing boundaries here already, and duplicating constants isn't the right approach - we either should extract this code out or move the UI code back.

This needs a wider rethink as we are technically crossing boundaries here already, and duplicating constants isn't the right approach - we either should extract this code out or move the UI code back.
model/profile.go Outdated
@ -378,1 +379,4 @@
group.Attributes = make(map[string]string)
// NOTE: this path technically only exists in UI, either we should move this code into the UI or a separate library
// or move those attrs back to Cwtch lib...but for now this is a nicety.
group.Attributes[attr.GetLocalScope("name")] = gci.GroupName
dan commented 2020-12-17 05:25:07 +00:00
Owner
Copy Link

should use SetAttribute() which uses p.lock.Lock() (ProcessInvite mostly just operates on args, doesnt touch the Profile, except fotthe call to AddGroup, which also uses the lock

should use SetAttribute() which uses p.lock.Lock() (ProcessInvite mostly just operates on args, doesnt touch the Profile, except fotthe call to AddGroup, which also uses the lock
sarah commented 2020-12-17 05:39:01 +00:00
Author
Owner
Copy Link

Ah yeah I wrote this code before writing the other code that actually does what you suggest and is in this PR...will delete.

Ah yeah I wrote this code before writing the other code that actually does what you suggest and is in this PR...will delete.
peer/cwtch_peer.go Outdated
@ -295,2 +296,4 @@
}
// GetServers returns an unordered list of servers
func (cp *cwtchPeer) GetServers() []string {
dan commented 2020-12-17 05:28:04 +00:00
Owner
Copy Link

cp.mutex.Lock()
defer cp.mutex.Unlock()

at the start

cp.mutex.Lock() defer cp.mutex.Unlock() at the start
sarah commented 2020-12-17 05:37:23 +00:00
Author
Owner
Copy Link

This would cause a deadlock because this only calls other peer functions.

This would cause a deadlock because this only calls other peer functions.
server/app/main.go Outdated
@ -83,2 +83,4 @@
log.Infof("Server Config: server:%s", base64.StdEncoding.EncodeToString(bundle))
server.Run(acn)
for {
time.Sleep(time.Second)
dan commented 2020-12-17 05:32:12 +00:00
Owner
Copy Link

hahahha oph...

hahahha oph...
sarah commented 2020-12-17 05:41:02 +00:00
Author
Owner
Copy Link

Not technically part of this PR but it works better...needs a complete rework, but out of scope.

Not technically part of this PR but it works better...needs a complete rework, but out of scope.
storage/v0/profile_store.go Outdated
@ -53,3 +53,3 @@
/********************************************************************************************/
// AddGroup For testing, adds a group to the profile (and startsa stream store)
// AddGroup For testing, adds a group to the profile (and starts a stream store)
dan commented 2020-12-17 05:35:30 +00:00
Owner
Copy Link

this is legacy v0 storage engine, just for loading old saves in order to upgrad them to v1

AddGroup here can just be (and should be deleted) rather than updated to post v0 model changes. As the models it imports change... unless we make a model/v0 ... it's window of usability dwindles anyways

this is legacy v0 storage engine, just for loading old saves in order to upgrad them to v1 AddGroup here can just be (and should be deleted) rather than updated to post v0 model changes. As the models it imports change... unless we make a model/v0 ... it's window of usability dwindles anyways
sarah commented 2020-12-17 05:40:30 +00:00
Author
Owner
Copy Link

Moving this to an issue, since deprecation is a separate concern.

Moving this to an issue, since deprecation is a separate concern.
buildbot commented 2020-12-17 05:48:34 +00:00
Member
Copy Link

Drone Build Status: success

https://build.openprivacy.ca/cwtch.im/cwtch/934

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/cwtch/934
dan merged commit 94b47d213f into master 2020-12-17 05:54:02 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
dan
Labels
Clear labels   
applications

   
BLOCKED

   
bug

   
design

   
duplicate

   
enhancement

   
fixed?

   
funding-needed

   
help wanted

   
infrastructure

   
invalid

   
payments

   
qubes

   
question

   
ready-for-implementation

   
refactor

   
spam

   
tapir-server

   
testing

   
tor

   
wontfix
No Label
applications
BLOCKED
bug
design
duplicate
enhancement
fixed?
funding-needed
help wanted
infrastructure
invalid
payments
qubes
question
ready-for-implementation
refactor
spam
tapir-server
testing
tor
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
dan
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: cwtch.im/cwtch#336
No description provided.
Delete Branch "group_create_ui"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?