From 4da828352f9a135834fad248ee4295f3b0a8d5e9 Mon Sep 17 00:00:00 2001 From: Marcus Vinicius Brasizza Date: Wed, 13 Dec 2023 11:41:38 -0300 Subject: [PATCH 1/5] feedback_discord --- feedback_discord/.gitignore | 75 ++++++ feedback_discord/.metadata | 10 + feedback_discord/CHANGELOG.md | 16 ++ feedback_discord/LICENSE | 201 ++++++++++++++++ feedback_discord/README.md | 60 +++++ feedback_discord/analysis_options.yaml | 4 + feedback_discord/example/example.dart | 73 ++++++ feedback_discord/lib/feedback_discord.dart | 5 + .../lib/src/feedback_discord.dart | 67 ++++++ feedback_discord/pubspec.lock | 226 ++++++++++++++++++ feedback_discord/pubspec.yaml | 25 ++ .../test/feedback_discord_test.dart | 90 +++++++ 12 files changed, 852 insertions(+) create mode 100644 feedback_discord/.gitignore create mode 100644 feedback_discord/.metadata create mode 100644 feedback_discord/CHANGELOG.md create mode 100644 feedback_discord/LICENSE create mode 100644 feedback_discord/README.md create mode 100644 feedback_discord/analysis_options.yaml create mode 100644 feedback_discord/example/example.dart create mode 100644 feedback_discord/lib/feedback_discord.dart create mode 100644 feedback_discord/lib/src/feedback_discord.dart create mode 100644 feedback_discord/pubspec.lock create mode 100644 feedback_discord/pubspec.yaml create mode 100644 feedback_discord/test/feedback_discord_test.dart diff --git a/feedback_discord/.gitignore b/feedback_discord/.gitignore new file mode 100644 index 00000000..a247422e --- /dev/null +++ b/feedback_discord/.gitignore @@ -0,0 +1,75 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +build/ + +# Android related +**/android/**/gradle-wrapper.jar +**/android/.gradle +**/android/captures/ +**/android/gradlew +**/android/gradlew.bat +**/android/local.properties +**/android/**/GeneratedPluginRegistrant.java + +# iOS/XCode related +**/ios/**/*.mode1v3 +**/ios/**/*.mode2v3 +**/ios/**/*.moved-aside +**/ios/**/*.pbxuser +**/ios/**/*.perspectivev3 +**/ios/**/*sync/ +**/ios/**/.sconsign.dblite +**/ios/**/.tags* +**/ios/**/.vagrant/ +**/ios/**/DerivedData/ +**/ios/**/Icon? +**/ios/**/Pods/ +**/ios/**/.symlinks/ +**/ios/**/profile +**/ios/**/xcuserdata +**/ios/.generated/ +**/ios/Flutter/App.framework +**/ios/Flutter/Flutter.framework +**/ios/Flutter/Flutter.podspec +**/ios/Flutter/Generated.xcconfig +**/ios/Flutter/ephemeral +**/ios/Flutter/app.flx +**/ios/Flutter/app.zip +**/ios/Flutter/flutter_assets/ +**/ios/Flutter/flutter_export_environment.sh +**/ios/ServiceDefinitions.json +**/ios/Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!**/ios/**/default.mode1v3 +!**/ios/**/default.mode2v3 +!**/ios/**/default.pbxuser +!**/ios/**/default.perspectivev3 diff --git a/feedback_discord/.metadata b/feedback_discord/.metadata new file mode 100644 index 00000000..af897ac4 --- /dev/null +++ b/feedback_discord/.metadata @@ -0,0 +1,10 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: b22742018b3edf16c6cadd7b76d9db5e7f9064b5 + channel: stable + +project_type: package diff --git a/feedback_discord/CHANGELOG.md b/feedback_discord/CHANGELOG.md new file mode 100644 index 00000000..8a2e5930 --- /dev/null +++ b/feedback_discord/CHANGELOG.md @@ -0,0 +1,16 @@ +## 3.0.0 + +* Update dependencies + +## 2.2.0 + +* This update is compatible with feedback 2.2.0 +* Improve documentation + +## 2.0.0+1 + +* Update Readme + +## 2.0.0 + +* Initial version diff --git a/feedback_discord/LICENSE b/feedback_discord/LICENSE new file mode 100644 index 00000000..770e0e5e --- /dev/null +++ b/feedback_discord/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2021 Jonas Uekötter + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/feedback_discord/README.md b/feedback_discord/README.md new file mode 100644 index 00000000..9f74f4ec --- /dev/null +++ b/feedback_discord/README.md @@ -0,0 +1,60 @@ +# feedback_gitlab + +## 🚀 Getting Started + +### Setup + +First, you will need to add `feedback_gitlab` to your `pubspec.yaml`. +The latest version is pub.dev. + +```yaml +dependencies: + flutter: + sdk: flutter + feedback_gitlab: x.y.z # use the latest version found on pub.dev +``` + +Then, run `flutter pub get` in your terminal. + +### Use it + +Just wrap your app in a `BetterFeedback` widget. +To show the feedback view just call `BetterFeedback.of(context).show(...);`. +The callback gets called when the user submits his feedback. + +```dart +import 'package:feedback/feedback.dart'; +import 'package:flutter/material.dart'; + +void main() { + runApp( + BetterFeedback( + child: const MyApp(), + ), + ); +} +``` + +Provide a way to show the feedback panel by calling +```dart +BetterFeedback.of(context).showAndUploadToGitLab( + projectId: 'project-Id', + apiToken: 'api-token', +); +``` +Provide a way to hide the feedback panel by calling `BetterFeedback.of(context).hide();` + + +## 📣 Author + +- Jonas Uekötter: [GitHub](https://github.com/ueman) and [Twitter](https://twitter.com/ue_man) + +## Issues, questions and contributing + +You can raise issues [here](https://github.com/ueman/feedback/issues). +If you've got a question do not hesitate to ask it [here](https://github.com/ueman/feedback/discussions). +Contributions are also welcome. You can do a pull request on GitHub [here](https://github.com/ueman/feedback/pulls). Please take a look at [`up for grabs`](https://github.com/ueman/feedback/issues?q=is%3Aopen+is%3Aissue+label%3Aup-for-grabs) issues first. + +## Sponsoring + +I'm working on my packages on my free-time, but I don't have as much time as I would. If this package or any other package I created is helping you, please consider to [sponsor](https://github.com/ueman#sponsor-me) me. By doing so, I will prioritize your issues or your pull-requests before the others. diff --git a/feedback_discord/analysis_options.yaml b/feedback_discord/analysis_options.yaml new file mode 100644 index 00000000..0bd999bf --- /dev/null +++ b/feedback_discord/analysis_options.yaml @@ -0,0 +1,4 @@ +include: package:flutter_lints/flutter.yaml + +linter: + rules: diff --git a/feedback_discord/example/example.dart b/feedback_discord/example/example.dart new file mode 100644 index 00000000..1e3ad6a4 --- /dev/null +++ b/feedback_discord/example/example.dart @@ -0,0 +1,73 @@ +import 'package:feedback_discord/feedback_discord.dart'; +import 'package:flutter/material.dart'; + +void main() { + runApp(const BetterFeedback(child: MyApp())); +} + +class MyApp extends StatelessWidget { + const MyApp({super.key}); + @override + Widget build(BuildContext context) { + return MaterialApp( + title: 'Flutter Demo', + theme: ThemeData( + primarySwatch: Colors.blue, + ), + home: const MyHomePage(title: 'Flutter Demo Home Page'), + ); + } +} + +class MyHomePage extends StatefulWidget { + const MyHomePage({super.key, required this.title}); + final String title; + + @override + State createState() => _MyHomePageState(); +} + +class _MyHomePageState extends State { + int _counter = 0; + + void _incrementCounter() { + setState(() { + _counter++; + }); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text(widget.title), + ), + body: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text('You have pushed the button this many times:'), + Text( + '$_counter', + style: Theme.of(context).textTheme.headlineMedium, + ), + ElevatedButton( + onPressed: () { + BetterFeedback.of(context).showAndUploadToDiscord( + channel: '#discord-feedbacks', + discordUrl: 'https://discord.com/api/webhooks/1184473488468217916/x3Umb1v_EEWsf3octWJgPAXYM1EMmnBkTr8-W3t4Fb-ePe6aOcZ2_6AIOa2IkiG4Xc_i', + ); + }, + child: const Text('Show Feedback view'), + ), + ], + ), + ), + floatingActionButton: FloatingActionButton( + onPressed: _incrementCounter, + tooltip: 'Increment', + child: const Icon(Icons.add), + ), + ); + } +} diff --git a/feedback_discord/lib/feedback_discord.dart b/feedback_discord/lib/feedback_discord.dart new file mode 100644 index 00000000..d906706c --- /dev/null +++ b/feedback_discord/lib/feedback_discord.dart @@ -0,0 +1,5 @@ +library feedback_gitlab; + +export 'package:feedback/feedback.dart'; + +export 'src/feedback_discord.dart'; diff --git a/feedback_discord/lib/src/feedback_discord.dart b/feedback_discord/lib/src/feedback_discord.dart new file mode 100644 index 00000000..9ba44625 --- /dev/null +++ b/feedback_discord/lib/src/feedback_discord.dart @@ -0,0 +1,67 @@ +import 'package:feedback/feedback.dart'; +import 'package:flutter/foundation.dart'; +import 'package:http/http.dart' as http; +import 'package:http_parser/http_parser.dart'; + +/// This is an extension to make it easier to call +/// [showAndUploadToGitLab]. +extension BetterFeedbackX on FeedbackController { + /// Example usage: + /// ```dart + /// import 'package:feedback_gitlab/feedback_gitlab.dart'; + /// + /// RaisedButton( + /// child: Text('Click me'), + /// onPressed: (){ + /// BetterFeedback.of(context).showAndUploadToGitLab + /// projectId: 'gitlab-project-id', + /// apiToken: 'gitlab-api-token', + /// gitlabUrl: 'gitlab.org', // optional, defaults to 'gitlab.com' + /// ); + /// } + /// ) + /// ``` + /// The API token needs access to: + /// - read_api + /// - write_repository + /// See https://docs.gitlab.com/ee/user/project/settings/project_access_tokens.html#limiting-scopes-of-a-project-access-token + void showAndUploadToDiscord({ + required String channel, + required String discordUrl, + http.Client? client, + }) { + show(uploadToDiscord( + channel: channel, + discordUrl: discordUrl, + client: client, + )); + } +} + +/// See [BetterFeedbackX.showAndUploadToGitLab]. +/// This is just [visibleForTesting]. +@visibleForTesting +OnFeedbackCallback uploadToDiscord({ + required String channel, + required String discordUrl, + http.Client? client, +}) { + final httpClient = client ?? http.Client(); + final baseUrl = discordUrl; + + return (UserFeedback feedback) async { + final uri = Uri.parse( + baseUrl, + ); + final uploadRequest = http.MultipartRequest('POST', uri) + ..fields['content'] = 'FeedbackTest' + ..files.add(http.MultipartFile.fromBytes( + 'file', + feedback.screenshot, + filename: 'feedback.png', + contentType: MediaType('image', 'png'), + )); + + await httpClient.send(uploadRequest); + }; +} diff --git a/feedback_discord/pubspec.lock b/feedback_discord/pubspec.lock new file mode 100644 index 00000000..71c4a764 --- /dev/null +++ b/feedback_discord/pubspec.lock @@ -0,0 +1,226 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + async: + dependency: transitive + description: + name: async + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" + source: hosted + version: "2.11.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + characters: + dependency: transitive + description: + name: characters + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" + source: hosted + version: "1.3.0" + clock: + dependency: transitive + description: + name: clock + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" + source: hosted + version: "1.1.1" + collection: + dependency: transitive + description: + name: collection + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" + source: hosted + version: "1.18.0" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" + source: hosted + version: "1.3.1" + feedback: + dependency: "direct main" + description: + name: feedback + sha256: "3cb138a56a3f3914dd38471479c351ce6df377abb29c5ebe4042be5481fee271" + url: "https://pub.dev" + source: hosted + version: "3.0.0" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 + url: "https://pub.dev" + source: hosted + version: "3.0.1" + flutter_localizations: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + http: + dependency: "direct main" + description: + name: http + sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 + url: "https://pub.dev" + source: hosted + version: "1.1.2" + http_parser: + dependency: "direct main" + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + intl: + dependency: transitive + description: + name: intl + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + url: "https://pub.dev" + source: hosted + version: "0.18.1" + lints: + dependency: transitive + description: + name: lints + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 + url: "https://pub.dev" + source: hosted + version: "3.0.0" + matcher: + dependency: transitive + description: + name: matcher + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" + source: hosted + version: "0.12.16" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + url: "https://pub.dev" + source: hosted + version: "0.5.0" + meta: + dependency: transitive + description: + name: meta + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + url: "https://pub.dev" + source: hosted + version: "1.10.0" + path: + dependency: transitive + description: + name: path + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" + source: hosted + version: "1.8.3" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + source_span: + dependency: transitive + description: + name: source_span + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" + source: hosted + version: "1.11.1" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" + source: hosted + version: "2.1.2" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + test_api: + dependency: transitive + description: + name: test_api + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + url: "https://pub.dev" + source: hosted + version: "0.6.1" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" + source: hosted + version: "1.3.2" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + url: "https://pub.dev" + source: hosted + version: "0.3.0" +sdks: + dart: ">=3.2.0 <4.0.0" + flutter: ">=3.10.0" diff --git a/feedback_discord/pubspec.yaml b/feedback_discord/pubspec.yaml new file mode 100644 index 00000000..3ab31710 --- /dev/null +++ b/feedback_discord/pubspec.yaml @@ -0,0 +1,25 @@ +name: feedback_discord +description: A Flutter package for getting better feedback. It allows the user to give interactive feedback directly in the app and upload it as an issue to Discord channel +version: 3.0.0 +homepage: https://uekoetter.dev +repository: https://github.com/ueman/feedback +issue_tracker: https://github.com/ueman/feedback/issues + +environment: + sdk: '>=3.0.0 <4.0.0' + flutter: '>=3.10.0' + +dependencies: + flutter: + sdk: flutter + feedback: ^3.0.0 + http: ^1.0.0 + http_parser: ^4.0.0 + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^3.0.0 + +flutter: + uses-material-design: true \ No newline at end of file diff --git a/feedback_discord/test/feedback_discord_test.dart b/feedback_discord/test/feedback_discord_test.dart new file mode 100644 index 00000000..eeaf327e --- /dev/null +++ b/feedback_discord/test/feedback_discord_test.dart @@ -0,0 +1,90 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:typed_data'; + +import 'package:feedback_discord/feedback_discord.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:http/http.dart'; +import 'package:http_parser/http_parser.dart'; + +void main() { + test('uploads', () async { + final mockClient = MockClient(); + var onFeedback = uploadToDiscord( + channel: '#discord-feedbacks', + discordUrl: 'https://discord.com/api/webhooks/', + client: mockClient, + ); + + onFeedback(UserFeedback( + screenshot: Uint8List.fromList([]), + text: 'foo bar', + )); + + final result = await mockClient.completer.future; + expect(result, true); + }); +} + +class MockClient extends BaseClient { + int calls = 0; + Completer completer = Completer(); + + @override + Future send(BaseRequest request) async { + calls++; + if (request is MultipartRequest) { + final response = toStreamedResponse( + request, + onMultipartRequest(request), + ); + + completer.complete(true); + return response; + } + + fail('This should not be reached'); + } + + Response onRequest(Request request) { + expect(request.method, 'POST'); + expect( + request.url, + Uri.parse( + 'https://discord.com/api/webhooks/', + ), + ); + return Response('', 200); + } + + Response onMultipartRequest(MultipartRequest request) { + expect(request.method, 'POST'); + expect(request.url, Uri.parse('https://discord.com/api/webhooks/')); + expect(request.files.length, 1); + + var file = request.files.first; + + expect(file.field, 'file'); + expect(file.contentType.mimeType, 'image/png'); + expect(file.filename, 'feedback.png'); + expect( + file.contentType.mimeType, + MediaType('image', 'png').mimeType, + ); + + return Response(jsonEncode({}), 200); + } + + StreamedResponse toStreamedResponse(BaseRequest request, Response response) { + return StreamedResponse( + ByteStream.fromBytes(response.bodyBytes), + response.statusCode, + contentLength: response.contentLength, + request: request, + headers: response.headers, + isRedirect: response.isRedirect, + persistentConnection: response.persistentConnection, + reasonPhrase: response.reasonPhrase, + ); + } +} From b1942deabb7e012321256d27efefaeaca901dc20 Mon Sep 17 00:00:00 2001 From: Marcus Vinicius Brasizza Date: Wed, 13 Dec 2023 12:07:08 -0300 Subject: [PATCH 2/5] feedback-discord --- feedback_discord/example/example.dart | 4 +- .../lib/src/feedback_discord.dart | 2 +- feedback_discord/pubspec.lock | 226 ------------------ 3 files changed, 3 insertions(+), 229 deletions(-) delete mode 100644 feedback_discord/pubspec.lock diff --git a/feedback_discord/example/example.dart b/feedback_discord/example/example.dart index 1e3ad6a4..443a885b 100644 --- a/feedback_discord/example/example.dart +++ b/feedback_discord/example/example.dart @@ -54,8 +54,8 @@ class _MyHomePageState extends State { ElevatedButton( onPressed: () { BetterFeedback.of(context).showAndUploadToDiscord( - channel: '#discord-feedbacks', - discordUrl: 'https://discord.com/api/webhooks/1184473488468217916/x3Umb1v_EEWsf3octWJgPAXYM1EMmnBkTr8-W3t4Fb-ePe6aOcZ2_6AIOa2IkiG4Xc_i', + channel: '#discord-feedback', + discordUrl: 'https://discord.com/api/webhooks/', ); }, child: const Text('Show Feedback view'), diff --git a/feedback_discord/lib/src/feedback_discord.dart b/feedback_discord/lib/src/feedback_discord.dart index 9ba44625..99b0bf64 100644 --- a/feedback_discord/lib/src/feedback_discord.dart +++ b/feedback_discord/lib/src/feedback_discord.dart @@ -5,7 +5,7 @@ import 'package:http_parser/http_parser.dart'; /// This is an extension to make it easier to call /// [showAndUploadToGitLab]. -extension BetterFeedbackX on FeedbackController { +extension BetterFeedbackDiscord on FeedbackController { /// Example usage: /// ```dart /// import 'package:feedback_gitlab/feedback_gitlab.dart'; diff --git a/feedback_discord/pubspec.lock b/feedback_discord/pubspec.lock deleted file mode 100644 index 71c4a764..00000000 --- a/feedback_discord/pubspec.lock +++ /dev/null @@ -1,226 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - async: - dependency: transitive - description: - name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" - url: "https://pub.dev" - source: hosted - version: "2.11.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - characters: - dependency: transitive - description: - name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" - url: "https://pub.dev" - source: hosted - version: "1.3.0" - clock: - dependency: transitive - description: - name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" - source: hosted - version: "1.1.1" - collection: - dependency: transitive - description: - name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a - url: "https://pub.dev" - source: hosted - version: "1.18.0" - fake_async: - dependency: transitive - description: - name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" - source: hosted - version: "1.3.1" - feedback: - dependency: "direct main" - description: - name: feedback - sha256: "3cb138a56a3f3914dd38471479c351ce6df377abb29c5ebe4042be5481fee271" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_lints: - dependency: "direct dev" - description: - name: flutter_lints - sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 - url: "https://pub.dev" - source: hosted - version: "3.0.1" - flutter_localizations: - dependency: transitive - description: flutter - source: sdk - version: "0.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - http: - dependency: "direct main" - description: - name: http - sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 - url: "https://pub.dev" - source: hosted - version: "1.1.2" - http_parser: - dependency: "direct main" - description: - name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" - url: "https://pub.dev" - source: hosted - version: "4.0.2" - intl: - dependency: transitive - description: - name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" - url: "https://pub.dev" - source: hosted - version: "0.18.1" - lints: - dependency: transitive - description: - name: lints - sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 - url: "https://pub.dev" - source: hosted - version: "3.0.0" - matcher: - dependency: transitive - description: - name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" - url: "https://pub.dev" - source: hosted - version: "0.12.16" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" - url: "https://pub.dev" - source: hosted - version: "0.5.0" - meta: - dependency: transitive - description: - name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e - url: "https://pub.dev" - source: hosted - version: "1.10.0" - path: - dependency: transitive - description: - name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" - url: "https://pub.dev" - source: hosted - version: "1.8.3" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" - url: "https://pub.dev" - source: hosted - version: "1.10.0" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" - url: "https://pub.dev" - source: hosted - version: "1.11.1" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 - url: "https://pub.dev" - source: hosted - version: "2.1.2" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" - source: hosted - version: "1.2.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" - source: hosted - version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" - url: "https://pub.dev" - source: hosted - version: "0.6.1" - typed_data: - dependency: transitive - description: - name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c - url: "https://pub.dev" - source: hosted - version: "1.3.2" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" - source: hosted - version: "2.1.4" - web: - dependency: transitive - description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 - url: "https://pub.dev" - source: hosted - version: "0.3.0" -sdks: - dart: ">=3.2.0 <4.0.0" - flutter: ">=3.10.0" From 670c3665e5ce55627adf119e0f84e41e48f5d2c3 Mon Sep 17 00:00:00 2001 From: Marcus Vinicius Brasizza Date: Wed, 13 Dec 2023 12:42:42 -0300 Subject: [PATCH 3/5] remove ignore --- feedback_discord/.gitignore | 75 ------------------------------------- 1 file changed, 75 deletions(-) delete mode 100644 feedback_discord/.gitignore diff --git a/feedback_discord/.gitignore b/feedback_discord/.gitignore deleted file mode 100644 index a247422e..00000000 --- a/feedback_discord/.gitignore +++ /dev/null @@ -1,75 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.idea/ - -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ - -# Flutter/Dart/Pub related -**/doc/api/ -.dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies -.packages -.pub-cache/ -.pub/ -build/ - -# Android related -**/android/**/gradle-wrapper.jar -**/android/.gradle -**/android/captures/ -**/android/gradlew -**/android/gradlew.bat -**/android/local.properties -**/android/**/GeneratedPluginRegistrant.java - -# iOS/XCode related -**/ios/**/*.mode1v3 -**/ios/**/*.mode2v3 -**/ios/**/*.moved-aside -**/ios/**/*.pbxuser -**/ios/**/*.perspectivev3 -**/ios/**/*sync/ -**/ios/**/.sconsign.dblite -**/ios/**/.tags* -**/ios/**/.vagrant/ -**/ios/**/DerivedData/ -**/ios/**/Icon? -**/ios/**/Pods/ -**/ios/**/.symlinks/ -**/ios/**/profile -**/ios/**/xcuserdata -**/ios/.generated/ -**/ios/Flutter/App.framework -**/ios/Flutter/Flutter.framework -**/ios/Flutter/Flutter.podspec -**/ios/Flutter/Generated.xcconfig -**/ios/Flutter/ephemeral -**/ios/Flutter/app.flx -**/ios/Flutter/app.zip -**/ios/Flutter/flutter_assets/ -**/ios/Flutter/flutter_export_environment.sh -**/ios/ServiceDefinitions.json -**/ios/Runner/GeneratedPluginRegistrant.* - -# Exceptions to above rules. -!**/ios/**/default.mode1v3 -!**/ios/**/default.mode2v3 -!**/ios/**/default.pbxuser -!**/ios/**/default.perspectivev3 From 5ef2246d989eeaeb31a7fffd4b7a11c2b43f1e29 Mon Sep 17 00:00:00 2001 From: Marcus Vinicius Brasizza Date: Wed, 13 Dec 2023 12:46:00 -0300 Subject: [PATCH 4/5] fix change logs and readme --- feedback_discord/CHANGELOG.md | 15 +-------------- feedback_discord/README.md | 8 ++++---- feedback_discord/pubspec.yaml | 2 +- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/feedback_discord/CHANGELOG.md b/feedback_discord/CHANGELOG.md index 8a2e5930..31490590 100644 --- a/feedback_discord/CHANGELOG.md +++ b/feedback_discord/CHANGELOG.md @@ -1,16 +1,3 @@ -## 3.0.0 - -* Update dependencies - -## 2.2.0 - -* This update is compatible with feedback 2.2.0 -* Improve documentation - -## 2.0.0+1 - -* Update Readme - -## 2.0.0 +## 1.0.0 * Initial version diff --git a/feedback_discord/README.md b/feedback_discord/README.md index 9f74f4ec..c41a2432 100644 --- a/feedback_discord/README.md +++ b/feedback_discord/README.md @@ -37,10 +37,10 @@ void main() { Provide a way to show the feedback panel by calling ```dart -BetterFeedback.of(context).showAndUploadToGitLab( - projectId: 'project-Id', - apiToken: 'api-token', -); + BetterFeedback.of(context).showAndUploadToDiscord( + channel: '#discord-feedback', + discordUrl: 'https://discord.com/api/webhooks/', + ); ``` Provide a way to hide the feedback panel by calling `BetterFeedback.of(context).hide();` diff --git a/feedback_discord/pubspec.yaml b/feedback_discord/pubspec.yaml index 3ab31710..bf24a695 100644 --- a/feedback_discord/pubspec.yaml +++ b/feedback_discord/pubspec.yaml @@ -1,6 +1,6 @@ name: feedback_discord description: A Flutter package for getting better feedback. It allows the user to give interactive feedback directly in the app and upload it as an issue to Discord channel -version: 3.0.0 +version: 1.0.0 homepage: https://uekoetter.dev repository: https://github.com/ueman/feedback issue_tracker: https://github.com/ueman/feedback/issues From 34df0b2d2c2757614dfb14e39573fd41ad0d318d Mon Sep 17 00:00:00 2001 From: Marcus Vinicius Brasizza Date: Wed, 13 Dec 2023 13:29:41 -0300 Subject: [PATCH 5/5] send content with the image --- feedback_discord/lib/src/feedback_discord.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feedback_discord/lib/src/feedback_discord.dart b/feedback_discord/lib/src/feedback_discord.dart index 99b0bf64..bec61f49 100644 --- a/feedback_discord/lib/src/feedback_discord.dart +++ b/feedback_discord/lib/src/feedback_discord.dart @@ -54,7 +54,7 @@ OnFeedbackCallback uploadToDiscord({ baseUrl, ); final uploadRequest = http.MultipartRequest('POST', uri) - ..fields['content'] = 'FeedbackTest' + ..fields['content'] = feedback.text ..files.add(http.MultipartFile.fromBytes( 'file', feedback.screenshot,