aboutsummaryrefslogtreecommitdiff
path: root/lib/models/activity.ml
diff options
context:
space:
mode:
authorAdelyn Breedlove <[email protected]>2019-01-13 23:52:45 +0000
committerAdelyn Breedlove <[email protected]>2019-01-13 23:52:45 +0000
commitd95f0342f9cf2280b5d9794ab638c16a59c02a69 (patch)
tree191164d198c07cf388d9aae8a54013e5613c272c /lib/models/activity.ml
parentMerge branch 'dev' into 'master' (diff)
parentAdd deriving sexp to models (diff)
downloaddisml-d95f0342f9cf2280b5d9794ab638c16a59c02a69.tar.xz
disml-d95f0342f9cf2280b5d9794ab638c16a59c02a69.zip
Merge branch 'switch-to-deriving_yojson' into 'master'
Switch to deriving yojson See merge request Mishio595/disml!12
Diffstat (limited to 'lib/models/activity.ml')
-rw-r--r--lib/models/activity.ml10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/models/activity.ml b/lib/models/activity.ml
index 6fe69b8..8e6ff80 100644
--- a/lib/models/activity.ml
+++ b/lib/models/activity.ml
@@ -1,3 +1,7 @@
-module Make(Http : S.Http) = struct
- type t = Activity_t.t
-end \ No newline at end of file
+open Core
+
+type t = {
+ name: string;
+ kind: int [@key "type"];
+ url: string [@default ""];
+} [@@deriving sexp, yojson { strict = false}] \ No newline at end of file