aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshiaki Asai <toshi.alternative@gmail.com>2016-10-22 19:35:02 +0900
committerToshiaki Asai <toshi.alternative@gmail.com>2016-10-22 19:35:02 +0900
commit71e817e6a240e623b7e262ba36ddb7c49170379a (patch)
tree1672bc6a276f6e817040d173e0ec66e7c9d88e97
parentb507b5a8b1c5df65e773473a3cb5a2817b9370c6 (diff)
parentd5570c1b8a718279bc40b5199c2701d1110ed5e4 (diff)
downloadmikutter-71e817e6a240e623b7e262ba36ddb7c49170379a.tar.gz
Merge branch 'topic/invalid-field-type' into develop
-rw-r--r--core/plugin/intent/model/intent_token.rb2
-rw-r--r--core/system/message.rb4
-rw-r--r--core/user.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/core/plugin/intent/model/intent_token.rb b/core/plugin/intent/model/intent_token.rb
index cd14286f..f22b0fa8 100644
--- a/core/plugin/intent/model/intent_token.rb
+++ b/core/plugin/intent/model/intent_token.rb
@@ -2,7 +2,7 @@
module Plugin::Intent
class IntentToken < Retriever::Model
- field.string :uri, required: true
+ field.uri :uri, required: true
field.has :model, Retriever::Model
field.has :intent, Plugin::Intent::Intent, required: true
field.has :parent, Plugin::Intent::IntentToken
diff --git a/core/system/message.rb b/core/system/message.rb
index 10cbe864..3f0389a1 100644
--- a/core/system/message.rb
+++ b/core/system/message.rb
@@ -11,8 +11,8 @@ class Mikutter::System::Message < Retriever::Model
field.string :description, required: true
field.has :user, Mikutter::System::User, required: true
- field.string :created
- field.string :modified
+ field.time :created
+ field.time :modified
entity_class Retriever::Entity::URLEntity
diff --git a/core/user.rb b/core/user.rb
index 7d247c82..6c4e7976 100644
--- a/core/user.rb
+++ b/core/user.rb
@@ -20,7 +20,7 @@ class User < Retriever::Model
# detail | detail
# profile_image_url | icon
- field.string :id
+ field.int :id
field.string :idname
field.string :name
field.string :location