cwtch.im
/
libcwtch-rs
3
0
Fork 1
Code Issues 1 Pull Requests Projects Releases 8 Wiki Activity

adding needed structs #10

Merged
sarah merged 2 commits from structs into main 2022-04-07 22:08:58 +00:00
Conversation 0 Commits 2 Files Changed 1 +144 -25
dan commented 2022-04-05 01:09:11 +00:00
Owner
Copy Link

Adding:

  • Experiments enums
  • Settings type and save function
  • Updated contact accepted and blocked fields
  • ConnectionState::new(String)
Adding: - Experiments enums - Settings type and save function - Updated contact accepted and blocked fields - ConnectionState::new(String)
dan force-pushed structs from dbf750dfcf to 70c043461b 2022-04-05 01:10:48 +00:00 Compare
sarah reviewed 2022-04-05 20:13:20 +00:00
src/structs.rs Outdated
@ -60,14 +77,18 @@ pub struct CwtchEvent {
pub struct Contact {
sarah commented 2022-04-05 20:08:31 +00:00
Owner
Copy Link

this should be Conversation now

this should be Conversation now
dan marked this conversation as resolved
src/structs.rs Outdated
@ -60,14 +77,18 @@ pub struct CwtchEvent {
pub struct Contact {
/// onion address / id of the contact
pub onion: String,
sarah commented 2022-04-05 20:08:39 +00:00
Owner
Copy Link

s/onion/handle

s/onion/handle
dan commented 2022-04-06 02:42:24 +00:00
Author
Owner
Copy Link

can't, this is for deserialization

https://git.openprivacy.ca/cwtch.im/libcwtch-go/src/branch/trunk/utils/contacts.go#L5

can't, this is for deserialization https://git.openprivacy.ca/cwtch.im/libcwtch-go/src/branch/trunk/utils/contacts.go#L5
sarah commented 2022-04-06 02:44:42 +00:00
Owner
Copy Link

#[serde(alias = "name")]

`#[serde(alias = "name")] `
dan marked this conversation as resolved
src/structs.rs
@ -61,2 +78,4 @@
/// onion address / id of the contact
pub onion: String,
/// unique identifier of the contact/conversation to be used in API access
pub identifier: i32,
sarah commented 2022-04-05 20:01:26 +00:00
Owner
Copy Link

u32?

u32?
dan commented 2022-04-06 02:54:22 +00:00
Author
Owner
Copy Link

can't do to auto generated api is i32, we can try and force conversion with.try_into().unwrap() but there's an additional problem in

https://git.openprivacy.ca/cwtch.im/libcwtch-go/src/branch/trunk/lib.go#L799

where we do infact use a negative convo id

can't do to auto generated api is i32, we can try and force conversion with.try_into().unwrap() but there's an additional problem in https://git.openprivacy.ca/cwtch.im/libcwtch-go/src/branch/trunk/lib.go#L799 where we do infact use a negative convo id
src/structs.rs Outdated
@ -68,3 +87,2 @@
pub status: ConnectionState,
/// contact authorization state as set by profile
pub authorization: ContactAuthorization,
/// has the contact been manually accpted
sarah commented 2022-04-05 20:11:15 +00:00
Owner
Copy Link

should ideally be packaged inan authorization struct exposing isAccepted() and isBlocked()

should ideally be packaged inan authorization struct exposing isAccepted() and isBlocked()
src/structs.rs Outdated
@ -71,2 +90,4 @@
/// has the contact been manually blocked
pub blocked: bool,
/// is this contact a group? if so "onion" will be a group ID
pub is_group: bool,
sarah commented 2022-04-05 20:10:39 +00:00
Owner
Copy Link

FIXME: deprecate

FIXME: deprecate
dan marked this conversation as resolved
src/structs.rs Outdated
@ -109,6 +130,103 @@ pub struct Message {
pub d: String,
sarah commented 2022-04-05 20:10:14 +00:00
Owner
Copy Link

?

?
dan commented 2022-04-06 02:36:42 +00:00
Author
Owner
Copy Link

https://git.openprivacy.ca/cwtch.im/cwtch/src/branch/master/model/overlay.go

https://git.openprivacy.ca/cwtch.im/cwtch/src/branch/master/model/overlay.go
src/structs.rs
@ -112,0 +184,4 @@
/// Enum of experiment types that can be managed in Settings
pub enum Experiments {
/// experiment enabeling in app management and running of Cwtch servers
sarah commented 2022-04-05 20:11:51 +00:00
Owner
Copy Link

spelling enabling

spelling enabling
dan marked this conversation as resolved
src/structs.rs Outdated
@ -112,0 +186,4 @@
pub enum Experiments {
/// experiment enabeling in app management and running of Cwtch servers
ServersExperiment,
/// experiment enabeling use of Cwtch groups
sarah commented 2022-04-05 20:11:56 +00:00
Owner
Copy Link

spelling enabling

spelling enabling
dan marked this conversation as resolved
src/structs.rs Outdated
@ -112,0 +188,4 @@
ServersExperiment,
/// experiment enabeling use of Cwtch groups
GroupExperiment,
/// experiment enabeling filesharing
sarah commented 2022-04-05 20:12:02 +00:00
Owner
Copy Link

spelling enabling

spelling enabling
dan marked this conversation as resolved
dan added 1 commit 2022-04-06 04:11:42 +00:00
sarah approved these changes 2022-04-07 22:08:54 +00:00
sarah merged commit 661f1f3f4c into main 2022-04-07 22:08:58 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
sarah
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 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/libcwtch-rs#10
No description provided.
Delete Branch "structs"

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?