Merge pull request #12 from roma-apps/update/latest

Update the latest code from Whalebird 2.7.3

CHANGELOG.md

@@ -1,6 +1,36 @@
 # Change Log
 
-## [2.7.1]
+## [2.7.3]
+### Added
+- [#925](https://github.com/h3poteto/whalebird-desktop/pull/925) Update access token using refresh token when expire the token
+
+### Fixed
+
+- [#927](https://github.com/h3poteto/whalebird-desktop/pull/927) Downgrade electron version to 4.2.2
+- [#924](https://github.com/h3poteto/whalebird-desktop/pull/924) Stop loading after initialized in direct messages
+- [#922](https://github.com/h3poteto/whalebird-desktop/pull/922) Unbind streaming for mentions when change accounts
+
+
+## [2.7.2] - 2019-05-21
+### Added
+- [#911](https://github.com/h3poteto/whalebird-desktop/pull/911) Add a menu to read follow requests, and accept/reject it
+- [#903](https://github.com/h3poteto/whalebird-desktop/pull/903) Add Italian translation
+- [#902](https://github.com/h3poteto/whalebird-desktop/pull/902) Add request loading circle
+### Changed
+- [#917](https://github.com/h3poteto/whalebird-desktop/pull/917) Change loading in order to change channel while loading
+- [#916](https://github.com/h3poteto/whalebird-desktop/pull/916) Stop loading after fetch home timeline
+- [#914](https://github.com/h3poteto/whalebird-desktop/pull/914) refactor: Move logics to vuex store in new toot
+- [#910](https://github.com/h3poteto/whalebird-desktop/pull/910) Update electron version to 5.0.1 for mas
+- [#900](https://github.com/h3poteto/whalebird-desktop/pull/900) Update electron version to 5.0.1
+- [#899](https://github.com/h3poteto/whalebird-desktop/pull/899) Use accounts/search API instead of v2/search
+### Fixed
+- [#919](https://github.com/h3poteto/whalebird-desktop/pull/919) Fix favourite and reblog event
+- [#918](https://github.com/h3poteto/whalebird-desktop/pull/918) Update favourited, Reblogged toot in all timelines
+- [#912](https://github.com/h3poteto/whalebird-desktop/pull/912) Update pinned hashtags if tags are exist
+- [#908](https://github.com/h3poteto/whalebird-desktop/pull/908) Remove commas between pinned hashtags in new toot
+
+
+## [2.7.1] - 2019-04-25
 ### Added
 - [#898](https://github.com/h3poteto/whalebird-desktop/pull/898) Build package for 32bit
 - [#891](https://github.com/h3poteto/whalebird-desktop/pull/891) Introduce prettier combinated eslint

package.json

@@ -32,7 +32,7 @@
     "build:linux": "npm run build && npm run package:linux",
     "build:win32": "npm run build && npm run package:win32",
     "build:win64": "npm run build && npm run package:win64",
-    "build:mas": "npm run build:clean && npm run pack && electron-packager ./ 'Roma' --platform=mas --arch=x64 --electron-version=4.0.8 --asar.unpackDir='build/sounds' --out=packages --ignore='^/src' --ignore='^/test' --ignore='^/.electron-vue' --ignore='^/.envrc' --ignore='^/packages' --ignore='^/plist' --ignore='^/static' --ignore='^/roma.db' --ignore='^/screenshot.png' --prune=true --icon=./build/icons/icon.icns --overwrite --app-bundle-id=com.vm.Roma-Desktop --app-version=$npm_package_config_appVersion --build-version=$npm_package_config_buildVersion --extend-info='./plist/team.plist' --osx-sign --app-category-type=public.app-category.social-networking",
+    "build:mas": "npm run build:clean && npm run pack && electron-packager ./ 'Roma' --platform=mas --arch=x64 --electron-version=4.2.2 --asar.unpackDir='build/sounds' --out=packages --ignore='^/src' --ignore='^/test' --ignore='^/.electron-vue' --ignore='^/.envrc' --ignore='^/packages' --ignore='^/plist' --ignore='^/static' --ignore='^/roma.db' --ignore='^/screenshot.png' --prune=true --icon=./build/icons/icon.icns --overwrite --app-bundle-id=com.vm.Roma-Desktop --app-version=$npm_package_config_appVersion --build-version=$npm_package_config_buildVersion --extend-info='./plist/team.plist' --osx-sign --app-category-type=public.app-category.social-networking",
     "package:mac": "electron-builder --mac --x64",
     "package:linux": "electron-builder --linux",
     "package:win32": "electron-builder --win --ia32",
@@ -228,7 +228,7 @@
     "css-loader": "^0.28.11",
     "del": "^3.0.0",
     "devtron": "^1.4.0",
-    "electron": "4.0.8",
+    "electron": "4.2.2",
     "electron-builder": "^20.39.0",
     "electron-debug": "^2.2.0",
     "electron-devtools-installer": "^2.2.4",

spec/renderer/integration/store/TimelineSpace/HeaderMenu.spec.ts

@@ -14,7 +14,8 @@ const list: List = {
 const state = (): HeaderMenuState => {
   return {
     title: 'Home',
-    reload: false
+    reload: false,
+    loading: false
   }
 }
 

spec/renderer/integration/store/TimelineSpace/SideMenu.spec.ts

@@ -26,6 +26,7 @@ const state = (): SideMenuState => {
     unreadLocalTimeline: false,
     unreadDirectMessagesTimeline: false,
     unreadPublicTimeline: false,
+    unreadFollowRequests: false,
     lists: [],
     tags: [],
     collapse: false
@@ -62,10 +63,7 @@ describe('SideMenu', () => {
         get: (_path: string, _params: object) => {
           return new Promise<Response<List[]>>(resolve => {
             const res: Response<List[]> = {
-              data: [
-                list1,
-                list2
-              ],
+              data: [list1, list2],
               status: 200,
               statusText: 'OK',
               headers: {}

spec/renderer/unit/store/TimelineSpace/HeaderMenu.spec.ts

@@ -6,7 +6,8 @@ describe('TimelineSpace/HeaderMenu', () => {
     beforeEach(() => {
       state = {
         title: 'Home',
-        reload: false
+        reload: false,
+        loading: false
       }
     })
     describe('changeReload', () => {

src/config/locales/de/translation.missing.json

@@ -1,10 +1,13 @@
 {
   "side_menu": {
-    "direct": "Direct messages"
+    "direct": "Direct messages",
+    "follow_requests": "Follow Requests"
   },
   "header_menu": {
     "settings": "Settings",
-    "switch_streaming": "Use websocket for streaming. If the timeline does not update with streaming, please try it."
+    "switch_streaming": "Use websocket for streaming. If the timeline does not update with streaming, please try it.",
+    "follow_requests": "Follow Requests",
+    "direct_messages": "Direct Messages"
   },
   "settings": {
     "timeline": {
@@ -38,5 +41,13 @@
         "hideAllAttachments": "Hide all medias"
       }
     }
+  },
+  "follow_requests": {
+    "accept": "Accept",
+    "reject": "Reject"
+  },
+  "message": {
+    "follow_request_accept_error": "Failed to accept the request",
+    "follow_reuqest_reject_error": "failed to reject the request"
   }
 }

src/config/locales/en/translation.json

@@ -49,6 +49,7 @@
     "notification": "Notification",
     "mention": "Mention",
     "direct": "Direct messages",
+    "follow_requests": "Follow Requests",
     "favourite": "Favourite",
     "local": "Local timeline",
     "public": "Public timeline",
@@ -61,6 +62,8 @@
     "notification": "Notification",
     "mention": "Mention",
     "favourite": "Favourite",
+    "follow_requests": "Follow Requests",
+    "direct_messages": "Direct Messages",
     "local": "Local timeline",
     "public": "Public timeline",
     "hashtag": "Hashtag",
@@ -298,6 +301,10 @@
       "followers": "Followers"
     }
   },
+  "follow_requests": {
+    "accept": "Accept",
+    "reject": "Reject"
+  },
   "hashtag": {
     "tag_name": "Tag name",
     "delete_tag": "Delete tag",
@@ -337,6 +344,8 @@
     "timeline_fetch_error": "Failed to fetch timeline",
     "notification_fetch_error": "Failed to fetch notification",
     "favourite_fetch_error": "Failed to fetch favorite",
+    "follow_request_accept_error": "Failed to accept the request",
+    "follow_reuqest_reject_error": "failed to reject the request",
     "start_streaming_error": "Failed to start streaming",
     "attach_error": "Could not attach the file",
     "authorize_duplicate_error": "Can not login the same account of the same domain",

src/config/locales/fr/translation.missing.json

@@ -0,0 +1,17 @@
+{
+  "side_menu": {
+    "follow_requests": "Follow Requests"
+  },
+  "header_menu": {
+    "follow_requests": "Follow Requests",
+    "direct_messages": "Direct Messages"
+  },
+  "follow_requests": {
+    "accept": "Accept",
+    "reject": "Reject"
+  },
+  "message": {
+    "follow_request_accept_error": "Failed to accept the request",
+    "follow_reuqest_reject_error": "failed to reject the request"
+  }
+}