Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149125
Change subject: Fixing edit eventlogging for abuse filter
......................................................................
Fixing edit eventlogging for abuse filter
With these fixes, matches behavior on Android I think. :)
Change-Id: I4caddbecf92c989f2e74ea6b76a88b29e1b50938
---
M wikipedia/Data/Operations/UploadSectionWikiTextOp.m
M wikipedia/EventLogging/EditFunnel.h
M wikipedia/EventLogging/EditFunnel.m
M wikipedia/View Controllers/Preview/PreviewAndSaveViewController.h
M wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
5 files changed, 25 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/25/149125/1
diff --git a/wikipedia/Data/Operations/UploadSectionWikiTextOp.m
b/wikipedia/Data/Operations/UploadSectionWikiTextOp.m
index 1d60265..09b1e44 100644
--- a/wikipedia/Data/Operations/UploadSectionWikiTextOp.m
+++ b/wikipedia/Data/Operations/UploadSectionWikiTextOp.m
@@ -126,6 +126,7 @@
// Make the verbose warning available from the
error.
errorDict[@"warning"] =
weakSelf.jsonRetrieved[@"edit"][@"warning"];
+ errorDict[@"code"] = abuseFilterCode;
// Set error condition so dependent ops don't
even start and so the errorBlock below will fire.
weakSelf.error = [NSError
errorWithDomain:@"Upload Wikitext Op" code:errorType userInfo:errorDict];
diff --git a/wikipedia/EventLogging/EditFunnel.h
b/wikipedia/EventLogging/EditFunnel.h
index 4cd3c70..dab7c7d 100644
--- a/wikipedia/EventLogging/EditFunnel.h
+++ b/wikipedia/EventLogging/EditFunnel.h
@@ -28,11 +28,11 @@
-(void)logSavedRevision:(int)revID;
-(void)logCaptchaShown;
-(void)logCaptchaFailure;
--(void)logAbuseFilterWarning:(NSString *)code;
--(void)logAbuseFilterError:(NSString *)code;
--(void)logAbuseFilterWarningIgnore:(NSString *)code;
--(void)logAbuseFilterWarningBack:(NSString *)code;
--(void)logSaveAttempt; // @FIXME USE
+-(void)logAbuseFilterWarning:(NSString *)name;
+-(void)logAbuseFilterError:(NSString *)name;
+-(void)logAbuseFilterWarningIgnore:(NSString *)name;
+-(void)logAbuseFilterWarningBack:(NSString *)name;
+-(void)logSaveAttempt;
-(void)logError:(NSString *)code;
@end
diff --git a/wikipedia/EventLogging/EditFunnel.m
b/wikipedia/EventLogging/EditFunnel.m
index 678b47d..911ed50 100644
--- a/wikipedia/EventLogging/EditFunnel.m
+++ b/wikipedia/EventLogging/EditFunnel.m
@@ -68,31 +68,31 @@
[self log:@{@"action": @"captchaFailure"}];
}
-- (void)logAbuseFilterWarning:(NSString *)code
+- (void)logAbuseFilterWarning:(NSString *)name
{
[self log:@{@"action": @"abuseFilterWarning",
- @"abuseFilterCode": (code ? code : @"")}];
+ @"abuseFilterName": (name ? name : @"")}];
}
-- (void)logAbuseFilterError:(NSString *)code
+- (void)logAbuseFilterError:(NSString *)name
{
[self log:@{@"action": @"abuseFilterError",
- @"abuseFilterCode": (code ? code : @"")}];
+ @"abuseFilterName": (name ? name : @"")}];
}
--(void)logAbuseFilterWarningIgnore:(NSString *)code
+-(void)logAbuseFilterWarningIgnore:(NSString *)name
{
[self log:@{@"action": @"abuseFilterWarningIgnore",
- @"abuseFilterCode": (code ? code : @"")}];
+ @"abuseFilterName": (name ? name : @"")}];
}
--(void)logAbuseFilterWarningBack:(NSString *)code
+-(void)logAbuseFilterWarningBack:(NSString *)name
{
[self log:@{@"action": @"abuseFilterWarningBack",
- @"abuseFilterCode": (code ? code : @"")}];
+ @"abuseFilterName": (name ? name : @"")}];
}
--(void)logSaveAttempt // @FIXME WHAT CALLS THIS
+-(void)logSaveAttempt
{
[self log:@{@"action": @"saveAttempt"}];
}
diff --git a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.h
b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.h
index 4a606f8..4ba92aa 100644
--- a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.h
+++ b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.h
@@ -13,6 +13,7 @@
@property (strong, nonatomic) NSManagedObjectID *sectionID;
@property (strong, nonatomic) NSString *wikiText;
@property (strong, nonatomic) EditFunnel *funnel;
+@property (strong, nonatomic) NSString *abuseFilterCode;
-(void)reloadCaptchaPushed:(id)sender;
diff --git a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
index fcd403f..70078aa 100644
--- a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
+++ b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
@@ -117,7 +117,7 @@
[ROOT popViewControllerAnimated:YES];
if(ROOT.topMenuViewController.navBarMode ==
NAVBAR_MODE_EDIT_WIKITEXT_WARNING){
- [self.funnel logAbuseFilterWarningBack:@"fixme"]; // @fixme
+ [self.funnel logAbuseFilterWarningBack:self.abuseFilterCode];
}
break;
@@ -127,7 +127,7 @@
switch (ROOT.topMenuViewController.navBarMode) {
case NAVBAR_MODE_EDIT_WIKITEXT_WARNING:
[self save];
- [self.funnel logAbuseFilterWarningIgnore:@"fixme"]; //
@fixme
+ [self.funnel
logAbuseFilterWarningIgnore:self.abuseFilterCode];
break;
case NAVBAR_MODE_EDIT_WIKITEXT_CAPTCHA:
[self save];
@@ -516,6 +516,8 @@
// it was transcluded from.
NSString *title = section.fromTitle ? section.fromTitle :
section.article.title;
+ [self.funnel logSaveAttempt];
+
UploadSectionWikiTextOp *uploadWikiTextOp =
[[UploadSectionWikiTextOp alloc] initForPageTitle:title
domain:section.article.domain section:section.index wikiText:self.wikiText
summary:editSummary captchaId:self.captchaId
captchaWord:self.captchaViewController.captchaTextBox.text
completionBlock:^(NSDictionary *resultDict){
@@ -600,7 +602,7 @@
case WIKITEXT_UPLOAD_ERROR_ABUSEFILTER_OTHER:
{
dispatch_async(dispatch_get_main_queue(), ^(void){
- NSString *warningHtml = error.userInfo[@"warning"];
+ //NSString *warningHtml = error.userInfo[@"warning"];
[self hideKeyboard];
@@ -612,7 +614,8 @@
bannerImage = @"abuse-filter-disallowed.png";
bannerColor = WMF_COLOR_RED;
- [self.funnel logAbuseFilterError: warningHtml]; //
@fixme not sure this is right message
+ self.abuseFilterCode = error.userInfo[@"code"];
+ [self.funnel logAbuseFilterError:self.abuseFilterCode];
}else{
ROOT.topMenuViewController.navBarMode =
NAVBAR_MODE_EDIT_WIKITEXT_WARNING;
@@ -622,7 +625,8 @@
bannerImage = @"abuse-filter-flag-white.png";
bannerColor = WMF_COLOR_ORANGE;
- [self.funnel logAbuseFilterWarning:warningHtml]; //
@fixme not sure this is right message
+ self.abuseFilterCode = error.userInfo[@"code"];
+ [self.funnel
logAbuseFilterWarning:self.abuseFilterCode];
}
--
To view, visit https://gerrit.wikimedia.org/r/149125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4caddbecf92c989f2e74ea6b76a88b29e1b50938
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
